diff options
| author | Keith Packard <keithp@keithp.com> | 2011-07-19 16:21:40 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-07-21 20:18:31 -0700 |
| commit | f0b69efc29b024747a88ce020dada425e3193d5a (patch) | |
| tree | c39f14bf91434cae760489c79b711f25cadf1aad /drivers/gpu/drm/i915/i915_gem.c | |
| parent | a5071c2fd91f320bc40952df59517053a7346fa9 (diff) | |
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>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem.c')
| -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 e9d1d5c3a69..e46f2734acc 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; } |