summaryrefslogtreecommitdiff
path: root/shared-core
diff options
context:
space:
mode:
authorHong Liu <hong.liu@intel.com>2008-04-17 16:51:00 +0800
committerJesse Barnes <jbarnes@jbarnes-t61.(none)>2008-04-17 11:43:28 -0700
commit21a93915d8a21518c5da76a739f9459ed7f99d6a (patch)
treeb9a75366a1f5bb626031808a04b753b0bc6f4adb /shared-core
parent6cc2d7e7ae92bbac630d0053fc214521ce610dc6 (diff)
Porting DVO stuff
Ported from Xorg intel 2d driver. Changed interfaces definitions, which needed to be changed later if other device wants to use these DVO stuff.
Diffstat (limited to 'shared-core')
-rw-r--r--shared-core/i915_drv.h34
1 files changed, 31 insertions, 3 deletions
diff --git a/shared-core/i915_drv.h b/shared-core/i915_drv.h
index e32c36f1..80d8d462 100644
--- a/shared-core/i915_drv.h
+++ b/shared-core/i915_drv.h
@@ -685,11 +685,39 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller);
#define PPCR_ON (1<<0)
#define DVOA 0x61120
-#define DVOA_ON (1<<31)
#define DVOB 0x61140
-#define DVOB_ON (1<<31)
#define DVOC 0x61160
-#define DVOC_ON (1<<31)
+#define DVO_ENABLE (1 << 31)
+#define DVO_PIPE_B_SELECT (1 << 30)
+#define DVO_PIPE_STALL_UNUSED (0 << 28)
+#define DVO_PIPE_STALL (1 << 28)
+#define DVO_PIPE_STALL_TV (2 << 28)
+#define DVO_PIPE_STALL_MASK (3 << 28)
+#define DVO_USE_VGA_SYNC (1 << 15)
+#define DVO_DATA_ORDER_I740 (0 << 14)
+#define DVO_DATA_ORDER_FP (1 << 14)
+#define DVO_VSYNC_DISABLE (1 << 11)
+#define DVO_HSYNC_DISABLE (1 << 10)
+#define DVO_VSYNC_TRISTATE (1 << 9)
+#define DVO_HSYNC_TRISTATE (1 << 8)
+#define DVO_BORDER_ENABLE (1 << 7)
+#define DVO_DATA_ORDER_GBRG (1 << 6)
+#define DVO_DATA_ORDER_RGGB (0 << 6)
+#define DVO_DATA_ORDER_GBRG_ERRATA (0 << 6)
+#define DVO_DATA_ORDER_RGGB_ERRATA (1 << 6)
+#define DVO_VSYNC_ACTIVE_HIGH (1 << 4)
+#define DVO_HSYNC_ACTIVE_HIGH (1 << 3)
+#define DVO_BLANK_ACTIVE_HIGH (1 << 2)
+#define DVO_OUTPUT_CSTATE_PIXELS (1 << 1) /* SDG only */
+#define DVO_OUTPUT_SOURCE_SIZE_PIXELS (1 << 0) /* SDG only */
+#define DVO_PRESERVE_MASK (0x7<<24)
+
+#define DVOA_SRCDIM 0x61124
+#define DVOB_SRCDIM 0x61144
+#define DVOC_SRCDIM 0x61164
+#define DVO_SRCDIM_HORIZONTAL_SHIFT 12
+#define DVO_SRCDIM_VERTICAL_SHIFT 0
+
#define LVDS 0x61180
#define LVDS_ON (1<<31)