From: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Fri, 1 Jul 2011 18:08:56 +0000 (-0700)
Subject: drm/i915: apply HWSTAM writes to Ivy Bridge as well
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=2b1ecb7337592a7bf0989efac46a5b52daab769e;p=deliverable%2Flinux.git

drm/i915: apply HWSTAM writes to Ivy Bridge as well

In an attempt to fix 38862 and 38863.

Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Tested-by: Kenneth Graunke <kenneth@whitecape.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
---

diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index 226d8b296e69..3b03f85ea627 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/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