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

Commit 2c10d571 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/i915: wake up all pageflip waiters 



Otherwise it seems like we can get stuck with concurrent waiters.
Right now this /shouldn't/ be a problem, since all pending pageflip
waiters are serialized by the one mode_config.mutex, so there's at
most on waiter. But better paranoid than sorry, since this is tricky
code.

v2: WARN_ON(waitqueue_active) before waiting, as suggested by Chris
Wilson.

Acked-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent b5cc6c03

drivers/gpu/drm/i915/intel_display.c

+5 −1
Original line number Diff line number Diff line
@@ -2220,6 +2220,8 @@ intel_finish_fb(struct drm_framebuffer *old_fb) 
	bool was_interruptible = dev_priv->mm.interruptible;

	int ret;



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



	wait_event(dev_priv->pending_flip_queue,

		   atomic_read(&dev_priv->mm.wedged) ||

		   atomic_read(&obj->pending_flip) == 0);
@@ -2887,6 +2889,8 @@ static void intel_crtc_wait_for_pending_flips(struct drm_crtc *crtc) 
	if (crtc->fb == NULL)

		return;



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



	wait_event(dev_priv->pending_flip_queue,

		   !intel_crtc_has_pending_flip(crtc));
@@ -6824,7 +6828,7 @@ static void do_intel_finish_page_flip(struct drm_device *dev, 


	obj = work->old_fb_obj;



	wake_up(&dev_priv->pending_flip_queue);

	wake_up_all(&dev_priv->pending_flip_queue);



	queue_work(dev_priv->wq, &work->work);