From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Mon, 16 Jul 2012 12:05:34 +0000 (+0100)
Subject: drm/i915: Add -EIO to the list of known errors for __wait_seqno
X-Git-Tag: v3.6-rc1~83^2^2~6
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=eeef9b3874d756405ab8f71b4012a2e7ce31458e;p=~emulex%2Finfiniband.git

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>
---

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 89d62f635ac..5c4657a54f9 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,
 	}
 
 	switch (end) {
+	case -EIO:
 	case -EAGAIN: /* Wedged */
 	case -ERESTARTSYS: /* Signal */
 		return (int)end;