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

Commit 02efb359 authored by Daniel Vetter's avatar Daniel Vetter Committed by Rob Clark
Browse files

drm/msm: Simplify vblank event delivery 



The core takes care of handling the send_event vs. close() issues, we
can remove that driver code.

Cc: Rob Clark <robdclark@gmail.com>
Cc: linux-arm-msm@vger.kernel.org
Cc: freedreno@lists.freedesktop.org
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
Signed-off-by: default avatarRob Clark <robdclark@gmail.com>
parent 94df145c

drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c

+3 −9
Original line number Diff line number Diff line
@@ -114,16 +114,10 @@ static void complete_flip(struct drm_crtc *crtc, struct drm_file *file) 
	spin_lock_irqsave(&dev->event_lock, flags);

	event = mdp4_crtc->event;

	if (event) {

		/* if regular vblank case (!file) or if cancel-flip from

		 * preclose on file that requested flip, then send the

		 * event:

		 */

		if (!file || (event->base.file_priv == file)) {

		mdp4_crtc->event = NULL;

		DBG("%s: send event: %p", mdp4_crtc->name, event);

		drm_crtc_send_vblank_event(crtc, event);

	}

	}

	spin_unlock_irqrestore(&dev->event_lock, flags);

}

drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c

+3 −9
Original line number Diff line number Diff line
@@ -138,16 +138,10 @@ static void complete_flip(struct drm_crtc *crtc, struct drm_file *file) 
	spin_lock_irqsave(&dev->event_lock, flags);

	event = mdp5_crtc->event;

	if (event) {

		/* if regular vblank case (!file) or if cancel-flip from

		 * preclose on file that requested flip, then send the

		 * event:

		 */

		if (!file || (event->base.file_priv == file)) {

		mdp5_crtc->event = NULL;

		DBG("%s: send event: %p", crtc->name, event);

		drm_crtc_send_vblank_event(crtc, event);

	}

	}

	spin_unlock_irqrestore(&dev->event_lock, flags);



	if (mdp5_crtc->ctl && !crtc->state->enable) {