From: Keith Packard Date: Fri, 29 Jul 2011 21:45:21 +0000 (-0700) Subject: drm/i915: Ignore GPU wedged errors while pinning scanout buffers X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e0e3fb482105c65ce6f5480a86092e966a29ed79;p=linux-beck.git drm/i915: Ignore GPU wedged errors while pinning scanout buffers 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 Reviewed-by: Chris Wilson --- diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index a087e1bf0c2f..d5c7c7bccef5 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; }