From 74b16fcdba85a6f851ffe2ecb63a0f16235285a0 Mon Sep 17 00:00:00 2001
From: Lars-Peter Clausen <lars@metafoo.de>
Date: Sun, 5 Jul 2009 13:03:14 +0200
Subject: 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.

---
 src/glamo-regs.h | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'src/glamo-regs.h')

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 {
-- 
cgit v1.2.3