aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/drm/i915_drv.h
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2008-05-06 22:27:53 -0400
committerDave Airlie <airlied@linux.ie>2008-05-06 22:27:53 -0400
commite948e99400b28af152414f15f8c8023ff2430b79 (patch)
tree2a6d1ff037cc39ba8a3c6294e73b82ff70328570 /drivers/char/drm/i915_drv.h
parenta59e122a67b88925944d3bbf33d15229cf0fc3de (diff)
drm/i915: save and restore dsparb and d_state registers.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/char/drm/i915_drv.h')
-rw-r--r--drivers/char/drm/i915_drv.h10
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/char/drm/i915_drv.h b/drivers/char/drm/i915_drv.h
index 7619c49e5885..1b20f7c0639c 100644
--- a/drivers/char/drm/i915_drv.h
+++ b/drivers/char/drm/i915_drv.h
@@ -119,6 +119,7 @@ typedef struct drm_i915_private {
119 u8 saveLBB; 119 u8 saveLBB;
120 u32 saveDSPACNTR; 120 u32 saveDSPACNTR;
121 u32 saveDSPBCNTR; 121 u32 saveDSPBCNTR;
122 u32 saveDSPARB;
122 u32 savePIPEACONF; 123 u32 savePIPEACONF;
123 u32 savePIPEBCONF; 124 u32 savePIPEBCONF;
124 u32 savePIPEASRC; 125 u32 savePIPEASRC;
@@ -188,6 +189,7 @@ typedef struct drm_i915_private {
188 u32 saveIIR; 189 u32 saveIIR;
189 u32 saveIMR; 190 u32 saveIMR;
190 u32 saveCACHE_MODE_0; 191 u32 saveCACHE_MODE_0;
192 u32 saveD_STATE;
191 u32 saveDSPCLK_GATE_D; 193 u32 saveDSPCLK_GATE_D;
192 u32 saveMI_ARB_STATE; 194 u32 saveMI_ARB_STATE;
193 u32 saveSWF0[16]; 195 u32 saveSWF0[16];
@@ -670,6 +672,8 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller);
670/** P1 value is 2 greater than this field */ 672/** P1 value is 2 greater than this field */
671# define VGA0_PD_P1_MASK (0x1f << 0) 673# define VGA0_PD_P1_MASK (0x1f << 0)
672 674
675/* PCI D state control register */
676#define D_STATE 0x6104
673#define DSPCLK_GATE_D 0x6200 677#define DSPCLK_GATE_D 0x6200
674 678
675/* I830 CRTC registers */ 679/* I830 CRTC registers */
@@ -980,6 +984,12 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller);
980#define PIPECONF_INTERLACE_W_FIELD_INDICATION (6 << 21) 984#define PIPECONF_INTERLACE_W_FIELD_INDICATION (6 << 21)
981#define PIPECONF_INTERLACE_FIELD_0_ONLY (7 << 21) 985#define PIPECONF_INTERLACE_FIELD_0_ONLY (7 << 21)
982 986
987#define DSPARB 0x70030
988#define DSPARB_CSTART_MASK (0x7f << 7)
989#define DSPARB_CSTART_SHIFT 7
990#define DSPARB_BSTART_MASK (0x7f)
991#define DSPARB_BSTART_SHIFT 0
992
983#define PIPEBCONF 0x71008 993#define PIPEBCONF 0x71008
984#define PIPEBCONF_ENABLE (1<<31) 994#define PIPEBCONF_ENABLE (1<<31)
985#define PIPEBCONF_DISABLE 0 995#define PIPEBCONF_DISABLE 0