---

yaml --- r: 254259 b: refs/heads/master c: 2b1ecb7 h: refs/heads/master i: 254257: 4048b11 254255: 4ee1a6f v: v3
git-mirror · Jul 1, 2011 · 7bab7f5 · 7bab7f5
1 parent 8e811ba
commit 7bab7f5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f71d4af4cd475aced6d9ec9730b03885ac80b833
+refs/heads/master: 2b1ecb7337592a7bf0989efac46a5b52daab769e
diff --git a/trunk/drivers/gpu/drm/i915/i915_irq.c b/trunk/drivers/gpu/drm/i915/i915_irq.c
@@ -1740,7 +1740,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