From eea500793dbac1de5e1509aa9f46940bacdf428b Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Mon, 16 Jul 2012 13:05:34 +0100
Subject: [PATCH] --- yaml --- r: 318767 b: refs/heads/master c:
 eeef9b3874d756405ab8f71b4012a2e7ce31458e h: refs/heads/master i:   318765:
 1f388eb738f267bd7cabeff4094e35dcd79be55d   318763:
 f6e33d012c8e3fa07e3f4b4b8bfb95a4b1c41b43   318759:
 d8bf342a5d1cec11ba140cc6767b956c89703913   318751:
 ee0e8790ca63580e67c89cd65b4baa0b907a13b7 v: v3

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

diff --git a/[refs] b/[refs]
index 0179beea7fe9..759564f2610b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d3373a241bbf034a1ef43e6417e3d0029c8a8145
+refs/heads/master: eeef9b3874d756405ab8f71b4012a2e7ce31458e
diff --git a/trunk/drivers/gpu/drm/i915/i915_gem.c b/trunk/drivers/gpu/drm/i915/i915_gem.c
index 89d62f635ac8..5c4657a54f97 100644
--- a/trunk/drivers/gpu/drm/i915/i915_gem.c
+++ b/trunk/drivers/gpu/drm/i915/i915_gem.c
@@ -2003,6 +2003,7 @@ static int __wait_seqno(struct intel_ring_buffer *ring, u32 seqno,
 	}
 
 	switch (end) {
+	case -EIO:
 	case -EAGAIN: /* Wedged */
 	case -ERESTARTSYS: /* Signal */
 		return (int)end;