Commit 42ff6572 authored by Eric Anholt's avatar Eric Anholt Committed by Keith Packard

drm/i915: Work around gen7 BLT ring synchronization issues.

Previous to this commit, testing easily reproduced a failure where the
seqno would apparently arrive after the IRQ associated with it, with test programs as simple as:

for (;;) {
    glCopyPixels(0, 0, 1, 1);
    glFinish();
}

Various workarounds we've seen for previous generations didn't work to
fix this issue, so until new information comes in, replace the IRQ
waits on the BLT ring with polling.
Signed-off-by: default avatarEric Anholt <eric@anholt.net>
Tested-by: default avatarEugeni Dodonov <eugeni.dodonov@intel.com>
Reviewed-by: default avatarEugeni Dodonov <eugeni.dodonov@intel.com>
Acked-by: default avatarKenneth Graunke <kenneth@whitecape.org>
Signed-off-by: default avatarKeith Packard <keithp@keithp.com>
parent 7ea29b13
...@@ -791,6 +791,17 @@ ring_add_request(struct intel_ring_buffer *ring, ...@@ -791,6 +791,17 @@ ring_add_request(struct intel_ring_buffer *ring,
return 0; 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 static bool
gen6_ring_get_irq(struct intel_ring_buffer *ring, u32 gflag, u32 rflag) gen6_ring_get_irq(struct intel_ring_buffer *ring, u32 gflag, u32 rflag)
{ {
...@@ -1557,5 +1568,8 @@ int intel_init_blt_ring_buffer(struct drm_device *dev) ...@@ -1557,5 +1568,8 @@ int intel_init_blt_ring_buffer(struct drm_device *dev)
*ring = gen6_blt_ring; *ring = gen6_blt_ring;
if (IS_GEN7(dev))
ring->irq_get = gen7_blt_ring_get_irq;
return intel_init_ring_buffer(dev, ring); return intel_init_ring_buffer(dev, ring);
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment