Commit 7ea29b13 authored Dec 22, 2011 by Eric Anholt Committed by Keith Packard Jan 03, 2012

drm/i915: Do the fallback non-IRQ wait in ring throttle, too.



As a workaround for IRQ synchronization issues in the gen7 BLT ring,
we want to turn the two wait functions into polling loops.

Signed-off-by: Eric Anholt <eric@anholt.net>
Tested-by: Eugeni Dodonov <eugeni.dodonov@intel.com>
Reviewed-by: Eugeni Dodonov <eugeni.dodonov@intel.com>
Acked-by: Kenneth Graunke <kenneth@whitecape.org>
Signed-off-by: Keith Packard <keithp@keithp.com>

parent 116ac8d2

drivers/gpu/drm/i915/i915_gem.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -3309,6 +3309,10 @@ 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),
		seqno) \|\|
		atomic_read(&dev_priv->mm.wedged), 3000)) {
		ret = -EBUSY;
		}
		}