Skip to content

Commit

Permalink
Revert "drm/i915: Work around gen7 BLT ring synchronization issues."
Browse files Browse the repository at this point in the history
This reverts commit 42ff657.

New forcewake voodoo makes this no longer necessary.

Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Keith Packard <keithp@keithp.com>
  • Loading branch information
Keith Packard committed Jan 20, 2012
1 parent bdfcdb6 commit 8f0fc97
Showing 1 changed file with 0 additions and 14 deletions.
14 changes: 0 additions & 14 deletions drivers/gpu/drm/i915/intel_ringbuffer.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down Expand Up @@ -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);
}

0 comments on commit 8f0fc97

Please sign in to comment.