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

Commit a4744786 authored by Lucas Stach's avatar Lucas Stach Committed by Philipp Zabel
Browse files

drm/imx: fix crtc vblank state regression 



The atomic conversion lost the notification to let the DRM core
know about the current state of the CRTC vblank interrupts. This
regressed the ability of the core to reject page flip attempts
on currently disabled CRTCs. Add back the notifications.

Signed-off-by: default avatarLucas Stach <l.stach@pengutronix.de>
Signed-off-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
parent c6c1f9bc

drivers/gpu/drm/imx/ipuv3-crtc.c

+4 −0
Original line number Diff line number Diff line
@@ -76,6 +76,8 @@ static void ipu_crtc_disable(struct drm_crtc *crtc) 
		crtc->state->event = NULL;

	}

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



	drm_crtc_vblank_off(crtc);

}



static void imx_drm_crtc_reset(struct drm_crtc *crtc)
@@ -175,6 +177,8 @@ static int ipu_crtc_atomic_check(struct drm_crtc *crtc, 
static void ipu_crtc_atomic_begin(struct drm_crtc *crtc,

				  struct drm_crtc_state *old_crtc_state)

{

	drm_crtc_vblank_on(crtc);



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

	if (crtc->state->event) {

		WARN_ON(drm_crtc_vblank_get(crtc));