[PULL] drm-intel-fixes (drm/i915 driver)

From: Keith Packard
Date: Sat Jun 25 2011 - 00:12:31 EST



Here's a few minor fixes for the intel drm driver.

This should fix:

* Lost interrupts on Sandybridge from the BSD ring
* Sandybridge forcewake error during suspend/resume
* Performance regression due to discarding GTT mappings
* Broken 9xx display at startup due to lost call to intel_enable_plane

The following changes since commit 56299378726d5f2ba8d3c8cbbd13cb280ba45e4f:

Linux 3.0-rc4 (2011-06-20 20:25:46 -0700)

are available in the git repository at:
ssh://master.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6.git drm-intel-fixes

Ben Widawsky (1):
drm/i915: save/resume forcewake lock fixes

Chris Wilson (1):
drm/i915: Apply HWSTAM workaround for BSD ring on SandyBridge

Eric Anholt (1):
Revert "drm/i915: Kill GTT mappings when moving from GTT domain"

Keith Packard (1):
drm/i915: Call intel_enable_plane from i9xx_crtc_mode_set (again)

drivers/gpu/drm/i915/i915_gem.c | 10 ++++------
drivers/gpu/drm/i915/i915_gem_execbuffer.c | 4 ----
drivers/gpu/drm/i915/i915_irq.c | 1 +
drivers/gpu/drm/i915/i915_reg.h | 1 +
drivers/gpu/drm/i915/i915_suspend.c | 5 +++++
drivers/gpu/drm/i915/intel_display.c | 3 +--
6 files changed, 12 insertions(+), 12 deletions(-)

--
keith.packard@xxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature