---

yaml --- r: 318767 b: refs/heads/master c: eeef9b3 h: refs/heads/master i: 318765: 1f388eb 318763: f6e33d0 318759: d8bf342 318751: ee0e879 v: v3
git-mirror · Jul 25, 2012 · eea5007 · eea5007
1 parent 88593f2
commit eea5007
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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;