Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 975d568a authored by Chris Wilson's avatar Chris Wilson Committed by Daniel Vetter
Browse files

drm/i915: Make wait-for-pending-flips more defensive 

Be sure to always flush a stuck pageflip even if we couldn't possibly
expect one to be there.

References: https://bugs.freedesktop.org/show_bug.cgi?id=82612


Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent e07f0552

drivers/gpu/drm/i915/intel_display.c

+5 −7
Original line number Diff line number Diff line
@@ -3363,19 +3363,17 @@ void intel_crtc_wait_for_pending_flips(struct drm_crtc *crtc) 
	struct drm_device *dev = crtc->dev;

	struct drm_i915_private *dev_priv = dev->dev_private;



	if (crtc->primary->fb == NULL)

		return;



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



	WARN_ON(wait_event_timeout(dev_priv->pending_flip_queue,

				   !intel_crtc_has_pending_flip(crtc),

				   60*HZ) == 0);



	if (crtc->primary->fb) {

		mutex_lock(&dev->struct_mutex);

		intel_finish_fb(crtc->primary->fb);

		mutex_unlock(&dev->struct_mutex);

	}

}



/* Program iCLKIP clock to the desired frequency */

static void lpt_program_iclkip(struct drm_crtc *crtc)