---

yaml --- r: 286845 b: refs/heads/master c: bdfcdb6 h: refs/heads/master i: 286843: b13d8bb v: v3
git-mirror · Jan 19, 2012 · 5c9c230 · 5c9c230
1 parent 97be5dd
commit 5c9c230
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4cd53c0c8b01fc05c3ad5b2acdad02e37d3c2f55
+refs/heads/master: bdfcdb63795b058bba9e78d32102b39014f649fe
diff --git a/trunk/drivers/gpu/drm/i915/i915_irq.c b/trunk/drivers/gpu/drm/i915/i915_irq.c
@@ -1751,7 +1751,8 @@ 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) || IS_GEN7(dev)) {
+
+	if (IS_GEN6(dev)) {
 		/* Workaround stalls observed on Sandy Bridge GPUs by
 		 * making the blitter command streamer generate a
 		 * write to the Hardware Status Page for