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

Commit ce9a8f1a authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Tomi Valkeinen
Browse files

drm: omapdrm: Handle events when enabling/disabling CRTCs 



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 avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent 2a172037

drivers/gpu/drm/omapdrm/omap_crtc.c

+22 −8
Original line number Diff line number Diff line
@@ -343,6 +343,19 @@ static void omap_crtc_destroy(struct drm_crtc *crtc) 
	kfree(omap_crtc);

}



static void omap_crtc_arm_event(struct drm_crtc *crtc)

{

	struct omap_crtc *omap_crtc = to_omap_crtc(crtc);



	WARN_ON(omap_crtc->pending);

	omap_crtc->pending = true;



	if (crtc->state->event) {

		omap_crtc->event = crtc->state->event;

		crtc->state->event = NULL;

	}

}



static void omap_crtc_enable(struct drm_crtc *crtc)

{

	struct omap_crtc *omap_crtc = to_omap_crtc(crtc);
@@ -355,8 +368,7 @@ static void omap_crtc_enable(struct drm_crtc *crtc) 
	ret = drm_crtc_vblank_get(crtc);

	WARN_ON(ret != 0);



	WARN_ON(omap_crtc->pending);

	omap_crtc->pending = true;

	omap_crtc_arm_event(crtc);

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

}
@@ -366,6 +378,13 @@ static void omap_crtc_disable(struct drm_crtc *crtc) 


	DBG("%s", omap_crtc->name);



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

	if (crtc->state->event) {

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

		crtc->state->event = NULL;

	}

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



	drm_crtc_vblank_off(crtc);

}
@@ -473,12 +492,7 @@ static void omap_crtc_atomic_flush(struct drm_crtc *crtc, 


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

	priv->dispc_ops->mgr_go(omap_crtc->channel);



	WARN_ON(omap_crtc->pending);

	omap_crtc->pending = true;



	if (crtc->state->event)

		omap_crtc->event = crtc->state->event;

	omap_crtc_arm_event(crtc);

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

}