Mesa (master): radeon: correct fix for tiling with the legacy build

[Alex Deucher]

Module: Mesa
Branch: master
Commit: f7474a577d54765d893b78fbf0d6a969c2dc60cd
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f7474a577d54765d893b78fbf0d6a969c2dc60cd

Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Fri Aug  7 17:35:12 2009 -0400

radeon: correct fix for tiling with the legacy build

---

 src/mesa/drivers/dri/radeon/radeon_bo_drm.h       |    6 ------
 src/mesa/drivers/dri/radeon/radeon_bocs_wrapper.h |    6 ++++++
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/mesa/drivers/dri/radeon/radeon_bo_drm.h b/src/mesa/drivers/dri/radeon/radeon_bo_drm.h
index 427162d..d52fb01 100644
--- a/src/mesa/drivers/dri/radeon/radeon_bo_drm.h
+++ b/src/mesa/drivers/dri/radeon/radeon_bo_drm.h
@@ -42,12 +42,6 @@
 #define RADEON_BO_FLAGS_MACRO_TILE  1
 #define RADEON_BO_FLAGS_MICRO_TILE  2
 
-#define RADEON_TILING_MACRO 0x1
-#define RADEON_TILING_MICRO 0x2
-#define RADEON_TILING_SWAP 0x4
-#define RADEON_TILING_SURFACE 0x8 /* this object requires a surface
-				   * when mapped - i.e. front buffer */
-
 struct radeon_bo_manager;
 
 struct radeon_bo {
diff --git a/src/mesa/drivers/dri/radeon/radeon_bocs_wrapper.h b/src/mesa/drivers/dri/radeon/radeon_bocs_wrapper.h
index e0c70dd..a42870f 100644
--- a/src/mesa/drivers/dri/radeon/radeon_bocs_wrapper.h
+++ b/src/mesa/drivers/dri/radeon/radeon_bocs_wrapper.h
@@ -15,6 +15,12 @@
 #define RADEON_GEM_DOMAIN_GTT 0x2   // GTT or cache flushed
 #define RADEON_GEM_DOMAIN_VRAM 0x4  // VRAM domain
 
+#define RADEON_TILING_MACRO 0x1
+#define RADEON_TILING_MICRO 0x2
+#define RADEON_TILING_SWAP 0x4
+#define RADEON_TILING_SURFACE 0x8 /* this object requires a surface
+				   * when mapped - i.e. front buffer */
+
 /* to be used to build locally in mesa with no libdrm bits */
 #include "../radeon/radeon_bo_drm.h"
 #include "../radeon/radeon_cs_drm.h"