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

Commit 1899747e authored by Bibby Hsieh's avatar Bibby Hsieh Committed by Greg Kroah-Hartman
Browse files

drm/mediatek: handle events when enabling/disabling crtc 



[ Upstream commit 411f5c1eacfebb1f6e40b653d29447cdfe7282aa ]

The driver currently handles vblank events only when updating planes on
an already enabled CRTC. The atomic update API however allows requesting
an event when enabling or disabling a CRTC. This currently leads to
event objects being leaked in the kernel and to events not being sent
out. Fix it.

Signed-off-by: default avatarBibby Hsieh <bibby.hsieh@mediatek.com>
Signed-off-by: default avatarCK Hu <ck.hu@mediatek.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent f1b69d78

drivers/gpu/drm/mediatek/mtk_drm_crtc.c

+8 −0
Original line number Diff line number Diff line
@@ -308,6 +308,7 @@ static int mtk_crtc_ddp_hw_init(struct mtk_drm_crtc *mtk_crtc) 
static void mtk_crtc_ddp_hw_fini(struct mtk_drm_crtc *mtk_crtc)

{

	struct drm_device *drm = mtk_crtc->base.dev;

	struct drm_crtc *crtc = &mtk_crtc->base;

	int i;



	DRM_DEBUG_DRIVER("%s\n", __func__);
@@ -329,6 +330,13 @@ static void mtk_crtc_ddp_hw_fini(struct mtk_drm_crtc *mtk_crtc) 
	mtk_disp_mutex_unprepare(mtk_crtc->mutex);



	pm_runtime_put(drm->dev);



	if (crtc->state->event && !crtc->state->active) {

		spin_lock_irq(&crtc->dev->event_lock);

		drm_crtc_send_vblank_event(crtc, crtc->state->event);

		crtc->state->event = NULL;

		spin_unlock_irq(&crtc->dev->event_lock);

	}

}



static void mtk_crtc_ddp_config(struct drm_crtc *crtc)