summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorInki Dae <inki.dae@samsung.com>2014-10-05 19:15:50 -0700
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>2014-10-05 19:15:50 -0700
commite64d922496672b66a47b07146162678a861731b9 (patch)
treed926cb9073999fc3b3e842a6510b0aa5d0289de0
parent313b8a5a30d2944ba0d00b402e0a6d53c42924bc (diff)
parent3ee5a94e2d731c737141367ad78f8527b4bdc7bc (diff)
downloadlinux-3.10-e64d922496672b66a47b07146162678a861731b9.tar.gz
linux-3.10-e64d922496672b66a47b07146162678a861731b9.tar.bz2
linux-3.10-e64d922496672b66a47b07146162678a861731b9.zip
Merge "drm/exynos: fimd: fix screen shaking issue" into tizen
-rw-r--r--drivers/gpu/drm/exynos/exynos_drm_fimd.c19
1 files changed, 19 insertions, 0 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimd.c b/drivers/gpu/drm/exynos/exynos_drm_fimd.c
index 6e5e1a84d72..e7cc2ab311a 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_fimd.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_fimd.c
@@ -636,6 +636,25 @@ static void fimd_win_commit(struct exynos_drm_manager *mgr, int zpos)
}
/*
+ * Wait for the completion of current transmission if fimd is still
+ * transmitting video data.
+ *
+ * Below codes resolve following issue:
+ * when resumed, fimd_win_commit() could be called to update overlay
+ * relevent registers and then pae flip could be performed by userspace
+ * request. The problem is that te interrupt could occur and
+ * fimd_trigger() could be called before fimd_win_commit is called by
+ * page flip function, exynos_drm_crtc_page_flip.
+ *
+ * In this case, there is a problem that fimd_win_commit() is called by
+ * the page flip request while fimd is still transmitting video data
+ * so overlay registers are updated to new buffer. That makes screen
+ * to be shaked.
+ */
+ if (ctx->i80_if && atomic_read(&ctx->triggering))
+ fimd_wait_for_vblank(mgr);
+
+ /*
* SHADOWCON/PRTCON register is used for enabling timing.
*
* for example, once only width value of a register is set,