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 <[email protected]> Tested-by: Eugeni Dodonov <[email protected]> Reviewed-by: Eugeni Dodonov <[email protected]> Acked-by: Kenneth Graunke <[email protected]> Signed-off-by: Keith Packard <[email protected]>
jadonk · Jan 3, 2012 · 7ea29b1 · 7ea29b1
1 parent 116ac8d
commit 7ea29b1
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
@@ -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;
 		}
 	}