Parcourir la source

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

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Chris Wilson il y a 14 ans
Parent
commit
f4e0b29bf2
1 fichiers modifiés avec 2 ajouts et 0 suppressions
  1. 2 0
      drivers/gpu/drm/i915/intel_ringbuffer.c

+ 2 - 0
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;