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

Commit 38e5597a authored by Archit Taneja's avatar Archit Taneja Committed by Tomi Valkeinen
Browse files

drm/omap: protect omap_crtc's event with event_lock spinlock 



The vblank_cb callback and the page_flip ioctl can occur together in different
CPU contexts. vblank_cb uses takes tje drm device's event_lock spinlock when
sending the vblank event and updating omap_crtc->event and omap_crtc->od_fb.

Use the same spinlock in page_flip, to make sure the above omap_crtc parameters
are configured sequentially.

Signed-off-by: default avatarArchit Taneja <archit@ti.com>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent bc905ace

drivers/gpu/drm/omapdrm/omap_crtc.c

+6 −0
Original line number Diff line number Diff line
@@ -350,11 +350,15 @@ static int omap_crtc_page_flip_locked(struct drm_crtc *crtc, 
	struct omap_crtc *omap_crtc = to_omap_crtc(crtc);

	struct drm_plane *primary = crtc->primary;

	struct drm_gem_object *bo;

	unsigned long flags;



	DBG("%d -> %d (event=%p)", primary->fb ? primary->fb->base.id : -1,

			fb->base.id, event);



	spin_lock_irqsave(&dev->event_lock, flags);



	if (omap_crtc->old_fb) {

		spin_unlock_irqrestore(&dev->event_lock, flags);

		dev_err(dev->dev, "already a pending flip\n");

		return -EINVAL;

	}
@@ -362,6 +366,8 @@ static int omap_crtc_page_flip_locked(struct drm_crtc *crtc, 
	omap_crtc->event = event;

	omap_crtc->old_fb = primary->fb = fb;



	spin_unlock_irqrestore(&dev->event_lock, flags);



	/*

	 * Hold a reference temporarily until the crtc is updated

	 * and takes the reference to the bo.  This avoids it