Commit e959b5db authored by Eric Anholt's avatar Eric Anholt Committed by Keith Packard

drm/i915: Make the fallback IRQ wait not sleep.

The waits we do here are generally so short that sleeping is a bad
idea unless we have an IRQ to wake us up.  Improves regression test
performance from 18 minutes to 3.5 minutes on gen7, which is now
consistent with the previous generation.
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 42ff6572
......@@ -2006,7 +2006,7 @@ i915_wait_request(struct intel_ring_buffer *ring,
|| atomic_read(&dev_priv->mm.wedged));
ring->irq_put(ring);
} else if (wait_for(i915_seqno_passed(ring->get_seqno(ring),
} else if (wait_for_atomic(i915_seqno_passed(ring->get_seqno(ring),
seqno) ||
atomic_read(&dev_priv->mm.wedged), 3000))
ret = -EBUSY;
......@@ -3309,7 +3309,7 @@ i915_gem_ring_throttle(struct drm_device *dev, struct drm_file *file)
if (ret == 0 && atomic_read(&dev_priv->mm.wedged))
ret = -EIO;
} else if (wait_for(i915_seqno_passed(ring->get_seqno(ring),
} else if (wait_for_atomic(i915_seqno_passed(ring->get_seqno(ring),
seqno) ||
atomic_read(&dev_priv->mm.wedged), 3000)) {
ret = -EBUSY;
......
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