summaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorJesse Barnes2011-07-01 20:08:56 +0200
committerKeith Packard2011-07-01 22:28:53 +0200
commit2b1ecb7337592a7bf0989efac46a5b52daab769e (patch)
tree4a325133db2ecc2f2e01c8f11b4850a0f11f3faf /drivers/gpu
parentdrm/i915: move IRQ function table init to i915_irq.c (diff)
downloadkernel-qcow2-linux-2b1ecb7337592a7bf0989efac46a5b52daab769e.tar.gz
kernel-qcow2-linux-2b1ecb7337592a7bf0989efac46a5b52daab769e.tar.xz
kernel-qcow2-linux-2b1ecb7337592a7bf0989efac46a5b52daab769e.zip
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>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/i915/i915_irq.c2
1 files changed, 1 insertions, 1 deletions
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