[PATCH] drm/i915: Ignored GPU wedged errors while pinning scanout buffers

From: Keith Packard <keithp@keithp.com>
To: intel-gfx@lists.freedesktop.org
Subject: [PATCH] drm/i915: Ignored GPU wedged errors while pinning scanout buffers
Date: Fri, 29 Jul 2011 14:47:16 -0700	[thread overview]
Message-ID: <1311976036-4147-1-git-send-email-keithp@keithp.com> (raw)
In-Reply-To: <yunei1lol5y.fsf@aiko.keithp.com>

Failing to pin a scanout buffer will most likely lead to a black
screen, so if the GPU is wedged, then just let the pin happen and hope
that things work out OK.

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 drivers/gpu/drm/i915/i915_gem.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index a087e1b..d5c7c7b 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -3019,7 +3019,7 @@ i915_gem_object_set_to_display_plane(struct drm_i915_gem_object *obj,
 	/* Currently, we are always called from an non-interruptible context. */
 	if (pipelined != obj->ring) {
 		ret = i915_gem_object_wait_rendering(obj);
-		if (ret)
+		if (ret == -ERESTARTSYS)
 			return ret;
 	}
 
-- 
1.7.5.4
