summaryrefslogtreecommitdiff
path: root/drivers/gpu
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2012-01-19 21:13:47 -0800
committerKeith Packard <keithp@keithp.com>2012-01-20 10:20:44 -0800
commit8f0fc977f58c36e75e205486c1aebb9b8e4263e1 (patch)
treea6d48794c4b40c55cd7f857a4acf23af6ff64737 /drivers/gpu
parentbdfcdb63795b058bba9e78d32102b39014f649fe (diff)
downloadlinux-3.10-8f0fc977f58c36e75e205486c1aebb9b8e4263e1.tar.gz
linux-3.10-8f0fc977f58c36e75e205486c1aebb9b8e4263e1.tar.bz2
linux-3.10-8f0fc977f58c36e75e205486c1aebb9b8e4263e1.zip
Revert "drm/i915: Work around gen7 BLT ring synchronization issues."
This reverts commit 42ff6572e5a4a7414330a4ca91f0335da67deca9. New forcewake voodoo makes this no longer necessary. Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/i915/intel_ringbuffer.c14
1 files changed, 0 insertions, 14 deletions
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
index fa5702c5da4..1ab842c6032 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -805,17 +805,6 @@ ring_add_request(struct intel_ring_buffer *ring,
}
static bool
-gen7_blt_ring_get_irq(struct intel_ring_buffer *ring)
-{
- /* The BLT ring on IVB appears to have broken synchronization
- * between the seqno write and the interrupt, so that the
- * interrupt appears first. Returning false here makes
- * i915_wait_request() do a polling loop, instead.
- */
- return false;
-}
-
-static bool
gen6_ring_get_irq(struct intel_ring_buffer *ring, u32 gflag, u32 rflag)
{
struct drm_device *dev = ring->dev;
@@ -1600,8 +1589,5 @@ int intel_init_blt_ring_buffer(struct drm_device *dev)
*ring = gen6_blt_ring;
- if (IS_GEN7(dev))
- ring->irq_get = gen7_blt_ring_get_irq;
-
return intel_init_ring_buffer(dev, ring);
}