---

yaml --- r: 260179 b: refs/heads/master c: a7f0895 h: refs/heads/master i: 260177: 2f8f213 260175: dae7fa9 v: v3
git-mirror · Jul 1, 2011 · 9167310 · 9167310
1 parent 03de527
commit 9167310
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: bee4d4acf563f91a7796cca53111d91be2532935
+refs/heads/master: a7f08958d7ca69e26ec85fe49c0be3568a565493
diff --git a/trunk/drivers/gpu/drm/i915/i915_irq.c b/trunk/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