3 files changed, 38 insertions, 10 deletions

diff --git a/drivers/gpu/drm/exynos/exynos_drm_encoder.c b/drivers/gpu/drm/exynos/exynos_drm_encoder.c
index f2df06c603f7..d9afb11aac76 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_encoder.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_encoder.c
@@ -234,6 +234,39 @@ static void exynos_drm_encoder_commit(struct drm_encoder *encoder)
         exynos_encoder->dpms = DRM_MODE_DPMS_ON;
 }
 
+void exynos_drm_encoder_complete_scanout(struct drm_framebuffer *fb)
+{
+        struct exynos_drm_encoder *exynos_encoder;
+        struct exynos_drm_overlay_ops *overlay_ops;
+        struct exynos_drm_manager *manager;
+        struct drm_device *dev = fb->dev;
+        struct drm_encoder *encoder;
+
+        /*
+         * make sure that overlay data are updated to real hardware
+         * for all encoders.
+         */
+        list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
+                exynos_encoder = to_exynos_encoder(encoder);
+
+                /* if exynos was disabled, just ignor it. */
+                if (exynos_encoder->dpms > DRM_MODE_DPMS_ON)
+                        continue;
+
+                manager = exynos_encoder->manager;
+                overlay_ops = manager->overlay_ops;
+
+                /*
+                 * wait for vblank interrupt
+                 * - this makes sure that overlay data are updated to
+                 *      real hardware.
+                 */
+                if (overlay_ops->wait_for_vblank)
+                        overlay_ops->wait_for_vblank(manager->dev);
+        }
+}
+
+
 static void exynos_drm_encoder_disable(struct drm_encoder *encoder)
 {
         struct drm_plane *plane;
@@ -505,14 +538,4 @@ void exynos_drm_encoder_plane_disable(struct drm_encoder *encoder, void *data)
 
         if (overlay_ops && overlay_ops->disable)
                 overlay_ops->disable(manager->dev, zpos);
-
-        /*
-         * wait for vblank interrupt
-         * - this makes sure that hardware overlay is disabled to avoid
-         * for the dma accesses to memory after gem buffer was released
-         * because the setting for disabling the overlay will be updated
-         * at vsync.
-         */
-        if (overlay_ops && overlay_ops->wait_for_vblank)
-                overlay_ops->wait_for_vblank(manager->dev);
 }
diff --git a/drivers/gpu/drm/exynos/exynos_drm_encoder.h b/drivers/gpu/drm/exynos/exynos_drm_encoder.h
index 6470d9ddf5a1..88bb25a2a917 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_encoder.h
+++ b/drivers/gpu/drm/exynos/exynos_drm_encoder.h
@@ -46,5 +46,6 @@ void exynos_drm_encoder_plane_mode_set(struct drm_encoder *encoder, void *data);
 void exynos_drm_encoder_plane_commit(struct drm_encoder *encoder, void *data);
 void exynos_drm_encoder_plane_enable(struct drm_encoder *encoder, void *data);
 void exynos_drm_encoder_plane_disable(struct drm_encoder *encoder, void *data);
+void exynos_drm_encoder_complete_scanout(struct drm_framebuffer *fb);
 
 #endif
diff --git a/drivers/gpu/drm/exynos/exynos_drm_fb.c b/drivers/gpu/drm/exynos/exynos_drm_fb.c
index 7190b64a368b..7413f4b729b0 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_fb.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_fb.c
@@ -36,6 +36,7 @@
 #include "exynos_drm_fb.h"
 #include "exynos_drm_gem.h"
 #include "exynos_drm_iommu.h"
+#include "exynos_drm_encoder.h"
 
 #define to_exynos_fb(x) container_of(x, struct exynos_drm_fb, fb)
 
@@ -85,6 +86,9 @@ static void exynos_drm_fb_destroy(struct drm_framebuffer *fb)
 
         DRM_DEBUG_KMS("%s\n", __FILE__);
 
+        /* make sure that overlay data are updated before relesing fb. */
+        exynos_drm_encoder_complete_scanout(fb);
+
         drm_framebuffer_cleanup(fb);
 
         for (i = 0; i < ARRAY_SIZE(exynos_fb->exynos_gem_obj); i++) {