From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Fri, 29 Oct 2010 20:06:16 +0000 (+0100)
Subject: drm/i915: Check if the GPU hung whilst waiting for the ring to clear
X-Git-Tag: v2.6.38-rc1~419^2~23^2~142
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=f4e0b29bf23687ac16dc476bd90cd4d8b0eacd5c;hp=6dda569fe0fb71a03e2a2e815761796f98232cdb

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

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---

diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
index 4d00da97905f..2e72d3a0740f 100644
--- 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;