summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichel Dänzer <michel.daenzer@amd.com>2015-04-24 09:50:51 +0900
committerMichel Dänzer <michel.daenzer@amd.com>2015-04-24 09:50:51 +0900
commitb947f4bf4efa8841bea4d306d0b0d21c7511c724 (patch)
treeb8aa66d63d2c2d216effb8c30c545a41ef96f34b
parentff62bf6e9dce55dbde92baf4fa30193c7344ee8a (diff)
Move #include "radeon_glamor.h" from amdgpu_drv.h to where it's needed
(cherry picked from radeon commit 4b8adebb80158bcf81ada83bb88517febe931b12) Reviewed-by: Christian König <christian.koenig@amd.com>
-rw-r--r--src/amdgpu_dri2.c3
-rw-r--r--src/amdgpu_drv.h2
-rw-r--r--src/amdgpu_glamor.c3
-rw-r--r--src/amdgpu_glamor.h3
-rw-r--r--src/amdgpu_kms.c1
-rw-r--r--src/amdgpu_video.c1
-rw-r--r--src/drmmode_display.c1
7 files changed, 8 insertions, 6 deletions
diff --git a/src/amdgpu_dri2.c b/src/amdgpu_dri2.c
index 26906d3..c018537 100644
--- a/src/amdgpu_dri2.c
+++ b/src/amdgpu_dri2.c
@@ -31,6 +31,7 @@
#include "amdgpu_drv.h"
#include "amdgpu_dri2.h"
+#include "amdgpu_glamor.h"
#include "amdgpu_video.h"
#include "amdgpu_pixmap.h"
@@ -67,8 +68,6 @@
#define FALLBACK_SWAP_DELAY 16
-#include <glamor.h>
-
typedef DRI2BufferPtr BufferPtr;
struct dri2_buffer_priv {
diff --git a/src/amdgpu_drv.h b/src/amdgpu_drv.h
index bb9ba14..4b87e6e 100644
--- a/src/amdgpu_drv.h
+++ b/src/amdgpu_drv.h
@@ -51,8 +51,6 @@
#include "fb.h"
-#include "amdgpu_glamor.h"
-
/* Cursor Support */
#include "xf86Cursor.h"
diff --git a/src/amdgpu_glamor.c b/src/amdgpu_glamor.c
index d0e2c44..00f3845 100644
--- a/src/amdgpu_glamor.c
+++ b/src/amdgpu_glamor.c
@@ -29,11 +29,10 @@
#endif
#include <xf86.h>
-#define GLAMOR_FOR_XORG 1
-#include <glamor.h>
#include "amdgpu_bo_helper.h"
#include "amdgpu_pixmap.h"
+#include "amdgpu_glamor.h"
#include <gbm.h>
diff --git a/src/amdgpu_glamor.h b/src/amdgpu_glamor.h
index bc4c628..0b4adfb 100644
--- a/src/amdgpu_glamor.h
+++ b/src/amdgpu_glamor.h
@@ -29,6 +29,9 @@
#include "xf86xv.h"
+#define GLAMOR_FOR_XORG 1
+#include <glamor.h>
+
Bool amdgpu_glamor_pre_init(ScrnInfoPtr scrn);
Bool amdgpu_glamor_init(ScreenPtr screen);
Bool amdgpu_glamor_create_screen_resources(ScreenPtr screen);
diff --git a/src/amdgpu_kms.c b/src/amdgpu_kms.c
index 4612000..798db5c 100644
--- a/src/amdgpu_kms.c
+++ b/src/amdgpu_kms.c
@@ -32,6 +32,7 @@
#include <sys/ioctl.h>
/* Driver data structures */
#include "amdgpu_drv.h"
+#include "amdgpu_glamor.h"
#include "amdgpu_probe.h"
#include "micmap.h"
diff --git a/src/amdgpu_video.c b/src/amdgpu_video.c
index 32f5709..2a5c3a0 100644
--- a/src/amdgpu_video.c
+++ b/src/amdgpu_video.c
@@ -9,6 +9,7 @@
#include <math.h>
#include "amdgpu_drv.h"
+#include "amdgpu_glamor.h"
#include "amdgpu_probe.h"
#include "amdgpu_video.h"
#include "amdgpu_pixmap.h"
diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index 59a3e5a..9e68d82 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -38,6 +38,7 @@
#include "drmmode_display.h"
#include "amdgpu_bo_helper.h"
+#include "amdgpu_glamor.h"
#include "amdgpu_pixmap.h"
/* DPMS */