From 7bab7f51dd7a6afa059824c556faf946e4ee5df6 Mon Sep 17 00:00:00 2001 From: Jesse Barnes Date: Fri, 1 Jul 2011 11:08:56 -0700 Subject: [PATCH] --- yaml --- r: 254259 b: refs/heads/master c: 2b1ecb7337592a7bf0989efac46a5b52daab769e h: refs/heads/master i: 254257: 4048b119c1cdcd49dfa977a831ba00c25f3fd3c7 254255: 4ee1a6f859e243917302328c0179dd25dc6b0b73 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 c084efbbbd59..d81b8f9953a3 100644 --- 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 index 226d8b296e69..3b03f85ea627 100644 --- 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