diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2011-01-20 04:40:42 -0500 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2011-01-20 04:41:07 -0500 |
commit | fe4402931e43e81a4129eba41d05cf8907603af5 (patch) | |
tree | ae9d438fa649bf12fd8d7119370eeca7b4d7ebb6 /drivers/gpu/drm/i915/i915_reg.h | |
parent | 417ae1476de3ae9689a374d70565f41b3474641e (diff) | |
parent | 4efe070896e1f7373c98a13713e659d1f5dee52a (diff) |
Merge branch 'drm-intel-fixes' into drm-intel-next
Apply the SandyBridge stability fixes from -fixes.
Diffstat (limited to 'drivers/gpu/drm/i915/i915_reg.h')
-rw-r--r-- | drivers/gpu/drm/i915/i915_reg.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h index 4c71f5692dae..77b153093cf1 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h | |||
@@ -513,6 +513,10 @@ | |||
513 | #define GEN6_BLITTER_SYNC_STATUS (1 << 24) | 513 | #define GEN6_BLITTER_SYNC_STATUS (1 << 24) |
514 | #define GEN6_BLITTER_USER_INTERRUPT (1 << 22) | 514 | #define GEN6_BLITTER_USER_INTERRUPT (1 << 22) |
515 | 515 | ||
516 | #define GEN6_BLITTER_ECOSKPD 0x221d0 | ||
517 | #define GEN6_BLITTER_LOCK_SHIFT 16 | ||
518 | #define GEN6_BLITTER_FBC_NOTIFY (1<<3) | ||
519 | |||
516 | #define GEN6_BSD_SLEEP_PSMI_CONTROL 0x12050 | 520 | #define GEN6_BSD_SLEEP_PSMI_CONTROL 0x12050 |
517 | #define GEN6_BSD_SLEEP_PSMI_CONTROL_RC_ILDL_MESSAGE_MODIFY_MASK (1 << 16) | 521 | #define GEN6_BSD_SLEEP_PSMI_CONTROL_RC_ILDL_MESSAGE_MODIFY_MASK (1 << 16) |
518 | #define GEN6_BSD_SLEEP_PSMI_CONTROL_RC_ILDL_MESSAGE_DISABLE (1 << 0) | 522 | #define GEN6_BSD_SLEEP_PSMI_CONTROL_RC_ILDL_MESSAGE_DISABLE (1 << 0) |
@@ -2631,6 +2635,8 @@ | |||
2631 | #define DISPLAY_PORT_PLL_BIOS_2 0x46014 | 2635 | #define DISPLAY_PORT_PLL_BIOS_2 0x46014 |
2632 | 2636 | ||
2633 | #define PCH_DSPCLK_GATE_D 0x42020 | 2637 | #define PCH_DSPCLK_GATE_D 0x42020 |
2638 | # define DPFCUNIT_CLOCK_GATE_DISABLE (1 << 9) | ||
2639 | # define DPFCRUNIT_CLOCK_GATE_DISABLE (1 << 8) | ||
2634 | # define DPFDUNIT_CLOCK_GATE_DISABLE (1 << 7) | 2640 | # define DPFDUNIT_CLOCK_GATE_DISABLE (1 << 7) |
2635 | # define DPARBUNIT_CLOCK_GATE_DISABLE (1 << 5) | 2641 | # define DPARBUNIT_CLOCK_GATE_DISABLE (1 << 5) |
2636 | 2642 | ||