diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2012-07-16 08:05:34 -0400 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-07-25 04:39:57 -0400 |
| commit | eeef9b3874d756405ab8f71b4012a2e7ce31458e (patch) | |
| tree | 060a982ab223136501f6d51aa3c13cdebbd6e37e /drivers/gpu | |
| parent | d3373a241bbf034a1ef43e6417e3d0029c8a8145 (diff) | |
drm/i915: Add -EIO to the list of known errors for __wait_seqno
This prevents a WARN introduced with
commit de2b998552c1534e87bfbc51ec5734b02bc89020
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>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 89d62f635ac8..5c4657a54f97 100644 --- 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, | |||
| 2003 | } | 2003 | } |
| 2004 | 2004 | ||
| 2005 | switch (end) { | 2005 | switch (end) { |
| 2006 | case -EIO: | ||
| 2006 | case -EAGAIN: /* Wedged */ | 2007 | case -EAGAIN: /* Wedged */ |
| 2007 | case -ERESTARTSYS: /* Signal */ | 2008 | case -ERESTARTSYS: /* Signal */ |
| 2008 | return (int)end; | 2009 | return (int)end; |