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

Message ID 1342440334-25683-1-git-send-email-chris@chris-wilson.co.uk
State New, archived
Headers show

Commit Message

Chris Wilson July 16, 2012, 12:05 p.m. UTC
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>
---
 drivers/gpu/drm/i915/i915_gem.c |    1 +
 1 file changed, 1 insertion(+)

Comments

Daniel Vetter July 16, 2012, 4:59 p.m. UTC | #1
On Mon, Jul 16, 2012 at 01:05:34PM +0100, Chris Wilson wrote:
> 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>

Me hangs head in shame ...

Thanks for the patch, queued for -next.
-Daniel

> ---
>  drivers/gpu/drm/i915/i915_gem.c |    1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
> index 2479a40..a835c39 100644
> --- a/drivers/gpu/drm/i915/i915_gem.c
> +++ b/drivers/gpu/drm/i915/i915_gem.c
> @@ -1942,6 +1942,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;
> -- 
> 1.7.10.4
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Patch
diff mbox

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 2479a40..a835c39 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -1942,6 +1942,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;