From 9f55f3f52f52c5e4abca01e988750cf0c8ec28aa Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Thu, 19 Jan 2012 21:13:47 -0800
Subject: [PATCH] --- yaml --- r: 286846 b: refs/heads/master c:
 8f0fc977f58c36e75e205486c1aebb9b8e4263e1 h: refs/heads/master v: v3

---
 [refs]                                        |  2 +-
 trunk/drivers/gpu/drm/i915/intel_ringbuffer.c | 14 --------------
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index 3dc2675b34da..645a4de5ff52 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bdfcdb63795b058bba9e78d32102b39014f649fe
+refs/heads/master: 8f0fc977f58c36e75e205486c1aebb9b8e4263e1
diff --git a/trunk/drivers/gpu/drm/i915/intel_ringbuffer.c b/trunk/drivers/gpu/drm/i915/intel_ringbuffer.c
index fa5702c5da42..1ab842c6032e 100644
--- a/trunk/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/trunk/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -804,17 +804,6 @@ ring_add_request(struct intel_ring_buffer *ring,
 	return 0;
 }
 
-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)
 {
@@ -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);
 }