drm/i915: Add -EIO to the list of known errors for __wait_seqno

ickle · danvet · commit eeef9b3874d7 · 2012-07-25T10:39:57.000+02:00
This prevents a WARN introduced with commit de2b998 Author: Daniel Vetter <daniel.vetter@ffwll.ch> Date: Wed Jul 4 22:52:50 2012 +0200 drm/i915: don't return a spurious -EIO from intel_ring_begin Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/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;

Original file line number	Diff line number	Diff line change
`@@ -2003,6 +2003,7 @@ static int __wait_seqno(struct intel_ring_buffer *ring, u32 seqno,`
`2003`	`2003`	`}`
`2004`	`2004`
`2005`	`2005`	`switch (end) {`
	`2006`	`+ case -EIO:`
`2006`	`2007`	`case -EAGAIN: /* Wedged */`
`2007`	`2008`	`case -ERESTARTSYS: /* Signal */`
`2008`	`2009`	`return (int)end;`