[PATCH 3/5] drm/i915: Suppress EIO during i915_gem_idle()

Chris Wilson
2012-04-14T08:56:08Z

i915_gem_idle() is called when we need to suspend the GPU. If the GPU is
already suspended by this point due to being wedged, we can safely
continue.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
drivers/gpu/drm/i915/i915_gem.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index ffe0853..a6819c1 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -3576,7 +3576,7 @@ i915_gem_idle(struct drm_device *dev)
}

ret = i915_gpu_idle(dev, true);
- if (ret) {
+ if (ret && ret != -EIO) {
mutex_unlock(&dev->struct_mutex);
return ret;
}
--
1.7.10