From: Keith Packard <keithp@keithp.com>
Date: Tue, 19 Jul 2011 23:21:40 +0000 (-0700)
Subject: drm/i915: Skip GPU wait for scanout pin while wedged
X-Git-Tag: MMI-PSA29.97-13-9~18635^2~10^2~12
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f0b69efc29b024747a88ce020dada425e3193d5a;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

drm/i915: Skip GPU wait for scanout pin while wedged

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.

v2: Just ignore any error from i915_gem_object_wait_rendering, as
suggested by Chris Wilson

Signed-off-by: Keith Packard <keithp@keithp.com>
---

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index e9d1d5c3a696..e46f2734acc5 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -3113,7 +3113,7 @@ i915_gem_object_pin_to_display_plane(struct drm_i915_gem_object *obj,
 
 	if (pipelined != obj->ring) {
 		ret = i915_gem_object_wait_rendering(obj);
-		if (ret)
+		if (ret == -ERESTARTSYS)
 			return ret;
 	}