diff options
| author | Keith Packard <keithp@keithp.com> | 2011-07-29 14:45:21 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-07-29 15:08:41 -0700 |
| commit | e0e3fb482105c65ce6f5480a86092e966a29ed79 (patch) | |
| tree | f19850467602a94720200a8e92b48c9997f74ef7 /drivers/gpu | |
| parent | b055c8f3ef9f7bc6ba415d900f298d7801a9d1d4 (diff) | |
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 <keithp@keithp.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | 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 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; } |