drm/i915: Check if the GPU hung whilst waiting for the ring to clear

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
git-mirror · Oct 29, 2010 · f4e0b29 · f4e0b29
1 parent 6dda569
commit f4e0b29
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -711,6 +711,8 @@ int intel_wait_ring_buffer(struct intel_ring_buffer *ring, int n)
 		}
 
 		msleep(1);
+		if (atomic_read(&dev_priv->mm.wedged))
+			return -EAGAIN;
 	} while (!time_after(jiffies, end));
 	trace_i915_ring_wait_end (dev);
 	return -EBUSY;