From 91673105aaeaea81bf32e3aad80e809fbecc3fc0 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Fri, 1 Jul 2011 13:33:49 -0700
Subject: [PATCH] --- yaml --- r: 260179 b: refs/heads/master c:
 a7f08958d7ca69e26ec85fe49c0be3568a565493 h: refs/heads/master i:   260177:
 2f8f213536b483367d74630c9e48811809dcf7e0   260175:
 dae7fa9ed227222852e0c8b63d7013dc7011f2ef v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/gpu/drm/i915/i915_irq.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 5af13516a997..2fbd0735979d 100644
--- 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
index 2e181614fda7..23d1ae67d279 100644
--- 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