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

Commit e1f48ee5 authored by Imre Deak's avatar Imre Deak Committed by Inki Dae
Browse files

drm/exynos: call drm_vblank_put for each queued flip event 



It's guaranteed that for each event on pageflip_event_list we have
called drm_vblank_get() - see exynos_drm_crtc_page_flip() - so checking
for this is redundant.

Also we need to call drm_vblank_put() for each event on the list, not
only once, otherwise we'd leak vblank references if there are multiple
events on the list.

Signed-off-by: default avatarImre Deak <imre.deak@intel.com>
Signed-off-by: default avatarInki Dae <inki.dae@samsung.com>
Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
parent 85473328

drivers/gpu/drm/exynos/exynos_drm_fimd.c

+1 −7
Original line number Diff line number Diff line
@@ -642,16 +642,10 @@ static void fimd_finish_pageflip(struct drm_device *drm_dev, int crtc) 


		list_move_tail(&e->base.link, &e->base.file_priv->event_list);

		wake_up_interruptible(&e->base.file_priv->event_wait);

		drm_vblank_put(drm_dev, crtc);

	}



	if (is_checked) {

		/*

		 * call drm_vblank_put only in case that drm_vblank_get was

		 * called.

		 */

		if (atomic_read(&drm_dev->vblank_refcount[crtc]) > 0)

			drm_vblank_put(drm_dev, crtc);



		/*

		 * don't off vblank if vblank_disable_allowed is 1,

		 * because vblank would be off by timer handler.

drivers/gpu/drm/exynos/exynos_drm_vidi.c

+1 −7
Original line number Diff line number Diff line
@@ -401,16 +401,10 @@ static void vidi_finish_pageflip(struct drm_device *drm_dev, int crtc) 


		list_move_tail(&e->base.link, &e->base.file_priv->event_list);

		wake_up_interruptible(&e->base.file_priv->event_wait);

		drm_vblank_put(drm_dev, crtc);

	}



	if (is_checked) {

		/*

		 * call drm_vblank_put only in case that drm_vblank_get was

		 * called.

		 */

		if (atomic_read(&drm_dev->vblank_refcount[crtc]) > 0)

			drm_vblank_put(drm_dev, crtc);



		/*

		 * don't off vblank if vblank_disable_allowed is 1,

		 * because vblank would be off by timer handler.

drivers/gpu/drm/exynos/exynos_mixer.c

+1 −10
Original line number Diff line number Diff line
@@ -884,7 +884,6 @@ static void mixer_finish_pageflip(struct drm_device *drm_dev, int crtc) 
	struct drm_pending_vblank_event *e, *t;

	struct timeval now;

	unsigned long flags;

	bool is_checked = false;



	spin_lock_irqsave(&drm_dev->event_lock, flags);
@@ -894,7 +893,6 @@ static void mixer_finish_pageflip(struct drm_device *drm_dev, int crtc) 
		if (crtc != e->pipe)

			continue;



		is_checked = true;

		do_gettimeofday(&now);

		e->event.sequence = 0;

		e->event.tv_sec = now.tv_sec;
@@ -902,15 +900,8 @@ static void mixer_finish_pageflip(struct drm_device *drm_dev, int crtc) 


		list_move_tail(&e->base.link, &e->base.file_priv->event_list);

		wake_up_interruptible(&e->base.file_priv->event_wait);

	}



	if (is_checked)

		/*

		 * call drm_vblank_put only in case that drm_vblank_get was

		 * called.

		 */

		if (atomic_read(&drm_dev->vblank_refcount[crtc]) > 0)

		drm_vblank_put(drm_dev, crtc);

	}



	spin_unlock_irqrestore(&drm_dev->event_lock, flags);

}