Skip to content

Commit

Permalink
drm/i915: Don't die in wait_for_pending_flips
Browse files Browse the repository at this point in the history
We can apperently miss them, but breaking the entire driver hampers
testing. So bail out after one minute, our customerary "this is a lost
cause" timeout.

References: https://bugs.freedesktop.org/show_bug.cgi?id=78383
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
  • Loading branch information
Daniel Vetter committed May 19, 2014
1 parent 42a88e9 commit eed6d67
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions drivers/gpu/drm/i915/intel_display.c
Original file line number Diff line number Diff line change
Expand Up @@ -3274,8 +3274,9 @@ static void intel_crtc_wait_for_pending_flips(struct drm_crtc *crtc)

WARN_ON(waitqueue_active(&dev_priv->pending_flip_queue));

wait_event(dev_priv->pending_flip_queue,
!intel_crtc_has_pending_flip(crtc));
WARN_ON(wait_event_timeout(dev_priv->pending_flip_queue,
!intel_crtc_has_pending_flip(crtc),
60*HZ) == 0);

mutex_lock(&dev->struct_mutex);
intel_finish_fb(crtc->primary->fb);
Expand Down

0 comments on commit eed6d67

Please sign in to comment.