summaryrefslogtreecommitdiff
path: root/src/glamo-regs.h
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2009-07-05 13:03:14 +0200
committerLars-Peter Clausen <lars@metafoo.de>2009-07-05 13:03:14 +0200
commit74b16fcdba85a6f851ffe2ecb63a0f16235285a0 (patch)
tree700cbedd856f286ae8668ff3b6b57a295af64af9 /src/glamo-regs.h
parent69ccc9307c6b6a1aeb1f51ea732af20d52a66685 (diff)
Implement support for engine ioctls. The glamo Xorg driver should only touch
cmdq or 2d registers, so we enable/disable engines through framebuffer ioctls. This needs support from the kernel side.
Diffstat (limited to 'src/glamo-regs.h')
-rw-r--r--src/glamo-regs.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/glamo-regs.h b/src/glamo-regs.h
index 18a84d7..6023dba 100644
--- a/src/glamo-regs.h
+++ b/src/glamo-regs.h
@@ -23,6 +23,8 @@
* MA 02111-1307 USA
*/
+
+
enum glamo_regster_offsets {
GLAMO_REGOFS_GENERIC = 0x0000,
GLAMO_REGOFS_HOSTBUS = 0x0200,
@@ -41,6 +43,8 @@ enum glamo_regster_offsets {
GLAMO_REGOFS_3D = 0x1b00,
};
+/* The Xorg driver is only allowed to touch 2D engine and cmdq engine registers */
+#ifndef HAS_ENGINE_ENABLE_IOCTL
enum glamo_register_generic {
GLAMO_REG_GCONF1 = 0x0000,
@@ -723,6 +727,8 @@ enum glamo_register_mpeg {
GLAMO_REG_MPEG_DEC_RB1 = REG_MPEG(0xcc),
};
+#endif /* #ifndef HAS_ENGINE_IOCTLS */
+
#define REG_CMDQ(x) (GLAMO_REGOFS_CMDQUEUE+(x))
enum glamo_register_cq {