diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-03-30 14:24:33 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-04-09 12:04:06 -0400 |
commit | fad2596acb5e4e028266e820fd8b47e88030a4ca (patch) | |
tree | 8e8674e7b29e5fdf31b530828d7af5b57374d640 | |
parent | 25c063004a6d0048c4dece74db4da117b9ae623e (diff) |
drm/i915: rip out old HWSTAM missed irq WA for vlv
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>
-rw-r--r-- | drivers/gpu/drm/i915/i915_irq.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index 06286a270b07..8496fa55122a 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c | |||
@@ -1998,18 +1998,6 @@ static void valleyview_irq_preinstall(struct drm_device *dev) | |||
1998 | I915_WRITE(RING_IMR(GEN6_BSD_RING_BASE), 0); | 1998 | I915_WRITE(RING_IMR(GEN6_BSD_RING_BASE), 0); |
1999 | I915_WRITE(RING_IMR(BLT_RING_BASE), 0); | 1999 | I915_WRITE(RING_IMR(BLT_RING_BASE), 0); |
2000 | 2000 | ||
2001 | if (IS_GEN6(dev) || IS_GEN7(dev)) { | ||
2002 | /* Workaround stalls observed on Sandy Bridge GPUs by | ||
2003 | * making the blitter command streamer generate a | ||
2004 | * write to the Hardware Status Page for | ||
2005 | * MI_USER_INTERRUPT. This appears to serialize the | ||
2006 | * previous seqno write out before the interrupt | ||
2007 | * happens. | ||
2008 | */ | ||
2009 | I915_WRITE(GEN6_BLITTER_HWSTAM, ~GEN6_BLITTER_USER_INTERRUPT); | ||
2010 | I915_WRITE(GEN6_BSD_HWSTAM, ~GEN6_BSD_USER_INTERRUPT); | ||
2011 | } | ||
2012 | |||
2013 | /* and GT */ | 2001 | /* and GT */ |
2014 | I915_WRITE(GTIIR, I915_READ(GTIIR)); | 2002 | I915_WRITE(GTIIR, I915_READ(GTIIR)); |
2015 | I915_WRITE(GTIIR, I915_READ(GTIIR)); | 2003 | I915_WRITE(GTIIR, I915_READ(GTIIR)); |