Merge branch 'drm-intel-fixes' into drm-intel-next

a7f08958 · Keith Packard · bee4d4ac · 2b1ecb73 · a7f08958
Commit a7f08958 authored Jul 01, 2011 by Keith Packard
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

drivers/gpu/drm/i915/i915_irq.c drivers/gpu/drm/i915/i915_irq.c +1 -1

No files found.
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -1745,7 +1745,7 @@ static void ironlake_irq_preinstall(struct drm_device *dev)
 		INIT_WORK(&dev_priv->rps_work, gen6_pm_rps_work);
 	I915_WRITE(HWSTAM, 0xeffe);
-	if (IS_GEN6(dev)) {
+	if (IS_GEN6(dev) || IS_GEN7(dev)) {
 		/* Workaround stalls observed on Sandy Bridge GPUs by
 		 * making the blitter command streamer generate a
 		 * write to the Hardware Status Page for