summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2012-01-05 01:05:26 +0100
committerKeith Packard <keithp@keithp.com>2012-01-19 15:45:44 -0800
commitbdfcdb63795b058bba9e78d32102b39014f649fe (patch)
tree0f3547bd0dc4ec8e0a36fe18306497cf66fde0e1
parent4cd53c0c8b01fc05c3ad5b2acdad02e37d3c2f55 (diff)
downloadop-kernel-dev-bdfcdb63795b058bba9e78d32102b39014f649fe.zip
op-kernel-dev-bdfcdb63795b058bba9e78d32102b39014f649fe.tar.gz
drm/i915: rip out the HWSTAM missed irq workaround
With the new ducttape of much finer quality, this seems to be no longer necessary. Tested on my ivb and snb machine with the usual suspects of testcases. (v2 by keithp -- limited change to IVB only for now) Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Acked-by: Ben Widawsky <ben@bwidawsk.net> Signed-off-by: Keith Packard <keithp@keithp.com>
-rw-r--r--drivers/gpu/drm/i915/i915_irq.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index 5d433fc..5bd4361 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/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
OpenPOWER on IntegriCloud