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: Imre Deak <imre.deak@intel.com>
Signed-off-by: Inki Dae <inki.dae@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>

3 files changed, 3 insertions, 24 deletions

diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimd.c b/drivers/gpu/drm/exynos/exynos_drm_fimd.c
index e08478f19f1a..23a57f4da478 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_fimd.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_fimd.c
@@ -642,17 +642,11 @@ 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.
                  */
diff --git a/drivers/gpu/drm/exynos/exynos_drm_vidi.c b/drivers/gpu/drm/exynos/exynos_drm_vidi.c
index e4b8a8f741f7..e26d45577551 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_vidi.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_vidi.c
@@ -401,17 +401,11 @@ 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.
                  */
diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c b/drivers/gpu/drm/exynos/exynos_mixer.c
index e7fbb823fd8e..0d3ed282376c 100644
--- a/drivers/gpu/drm/exynos/exynos_mixer.c
+++ b/drivers/gpu/drm/exynos/exynos_mixer.c
@@ -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,16 +900,9 @@ 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);
+                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);
-
         spin_unlock_irqrestore(&drm_dev->event_lock, flags);
 }