]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
drm/i915: rip out old HWSTAM missed irq WA for vlv
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Fri, 30 Mar 2012 18:24:33 +0000 (20:24 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Mon, 9 Apr 2012 16:04:06 +0000 (18:04 +0200)
This got copy-pasted from an older version. The newer kinds of
workarounds don't need this anymore.

Shame on me for not noticing when picking up the vlv irq patch.

Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/i915_irq.c

index 06286a270b071f97ea8508c02d6ececb9b84de2b..8496fa55122a39d1654f4e87b68acf85be60a383 100644 (file)
@@ -1998,18 +1998,6 @@ static void valleyview_irq_preinstall(struct drm_device *dev)
        I915_WRITE(RING_IMR(GEN6_BSD_RING_BASE), 0);
        I915_WRITE(RING_IMR(BLT_RING_BASE), 0);
 
-       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
-                * MI_USER_INTERRUPT.  This appears to serialize the
-                * previous seqno write out before the interrupt
-                * happens.
-                */
-               I915_WRITE(GEN6_BLITTER_HWSTAM, ~GEN6_BLITTER_USER_INTERRUPT);
-               I915_WRITE(GEN6_BSD_HWSTAM, ~GEN6_BSD_USER_INTERRUPT);
-       }
-
        /* and GT */
        I915_WRITE(GTIIR, I915_READ(GTIIR));
        I915_WRITE(GTIIR, I915_READ(GTIIR));