From 847873052d952395b92284355c39ef06510d5b2e Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Fri, 29 Oct 2010 21:06:16 +0100
Subject: [PATCH] --- yaml --- r: 228674 b: refs/heads/master c:
 f4e0b29bf23687ac16dc476bd90cd4d8b0eacd5c h: refs/heads/master v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/gpu/drm/i915/intel_ringbuffer.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 8a86397ffd84..039c6806aef0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6dda569fe0fb71a03e2a2e815761796f98232cdb
+refs/heads/master: f4e0b29bf23687ac16dc476bd90cd4d8b0eacd5c
diff --git a/trunk/drivers/gpu/drm/i915/intel_ringbuffer.c b/trunk/drivers/gpu/drm/i915/intel_ringbuffer.c
index 4d00da97905f..2e72d3a0740f 100644
--- a/trunk/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/trunk/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;