Skip to content

Commit

Permalink
drm/i915: Skip GPU wait for scanout pin while wedged
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Keith Packard committed Jul 22, 2011
1 parent a5071c2 commit f0b69ef
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/gpu/drm/i915/i915_gem.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down

0 comments on commit f0b69ef

Please sign in to comment.