drm/i915: Skip GPU wait for scanout pin while wedged
authorKeith Packard <keithp@keithp.com>
Tue, 19 Jul 2011 23:21:40 +0000 (16:21 -0700)
committerKeith Packard <keithp@keithp.com>
Fri, 22 Jul 2011 03:18:31 +0000 (20:18 -0700)
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>
drivers/gpu/drm/i915/i915_gem.c

index e9d1d5c..e46f273 100644 (file)
@@ -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;
        }