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

Commit c5614ae3 authored by Inki Dae's avatar Inki Dae Committed by Dave Airlie
Browse files

drm/exynos: fixed page flip issue. 



with vblank_refcount = 1, there was the case that drm_vblank_put
is called by specific page flip function so this patch fixes the
issue.

Signed-off-by: default avatarInki Dae <inki.dae@samsung.com>
Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent d081f566

drivers/gpu/drm/exynos/exynos_drm_crtc.c

+3 −3
Original line number Diff line number Diff line
@@ -307,9 +307,6 @@ static int exynos_drm_crtc_page_flip(struct drm_crtc *crtc, 
		 */

		event->pipe = exynos_crtc->pipe;



		list_add_tail(&event->base.link,

				&dev_priv->pageflip_event_list);



		ret = drm_vblank_get(dev, exynos_crtc->pipe);

		if (ret) {

			DRM_DEBUG("failed to acquire vblank counter\n");
@@ -318,6 +315,9 @@ static int exynos_drm_crtc_page_flip(struct drm_crtc *crtc, 
			goto out;

		}



		list_add_tail(&event->base.link,

				&dev_priv->pageflip_event_list);



		crtc->fb = fb;

		ret = exynos_drm_crtc_update(crtc);

		if (ret) {

drivers/gpu/drm/exynos/exynos_drm_fimd.c

+6 −1
Original line number Diff line number Diff line
@@ -604,6 +604,11 @@ static void fimd_finish_pageflip(struct drm_device *drm_dev, int 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);



		/*

drivers/gpu/drm/exynos/exynos_mixer.c

+6 −1
Original line number Diff line number Diff line
@@ -712,6 +712,11 @@ static void mixer_finish_pageflip(struct drm_device *drm_dev, int 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);



	spin_unlock_irqrestore(&drm_dev->event_lock, flags);