summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndreas Boll <andreas.boll.dev@gmail.com>2014-08-04 16:23:11 +0200
committerJerome Glisse <jglisse@redhat.com>2014-08-12 11:33:08 -0400
commitb4658901bf1d619f8ff9b5f94344894f935ee6c8 (patch)
tree1f67619f272643a7c92fbc2f4baf57fe986a871c /src
parent656bae7361c1e018553ef6d6d8c9efad616a4513 (diff)
radeon: move RADEON_TILING_{MASK, LINEAR} from radeon_drm.h to radeon.h
This allows us to drop radeon_drm.h from xf86-video-ati and use instead radeon_drm.h from libdrm. Signed-off-by: Andreas Boll <andreas.boll.dev@gmail.com>
Diffstat (limited to 'src')
-rw-r--r--src/radeon.h2
-rw-r--r--src/radeon_drm.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/radeon.h b/src/radeon.h
index eac6ed59..6123cc26 100644
--- a/src/radeon.h
+++ b/src/radeon.h
@@ -820,5 +820,7 @@ RADEONLog2(int val)
#endif
}
+#define RADEON_TILING_MASK 0xff
+#define RADEON_TILING_LINEAR 0x0
#endif /* _RADEON_H_ */
diff --git a/src/radeon_drm.h b/src/radeon_drm.h
index 2bbd8fa3..042e8222 100644
--- a/src/radeon_drm.h
+++ b/src/radeon_drm.h
@@ -800,8 +800,6 @@ struct drm_radeon_gem_create {
uint32_t flags;
};
-#define RADEON_TILING_MASK 0xff
-#define RADEON_TILING_LINEAR 0x0
#define RADEON_TILING_MACRO 0x1
#define RADEON_TILING_MICRO 0x2
#define RADEON_TILING_SWAP_16BIT 0x4