From 61c69dbcde1acbcfbb5035f1e2c2971cdaa9f208 Mon Sep 17 00:00:00 2001
From: Inki Dae <inki.dae@samsung.com>
Date: Mon, 20 Aug 2012 19:58:05 +0900
Subject: [PATCH] --- yaml --- r: 331761 b: refs/heads/master c:
 479cbc3eeed060879dc89652e497d7719f7ee1dc h: refs/heads/master i:   331759:
 7825fbffde10ca16564be49ca22a33dbda00116c v: v3

---
 [refs]                                         |  2 +-
 trunk/drivers/gpu/drm/exynos/exynos_drm_fimd.c | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 1f131cff93b3..ae49bd638f1f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b011941f0ffdefb87585d9ed786164037d0d50df
+refs/heads/master: 479cbc3eeed060879dc89652e497d7719f7ee1dc
diff --git a/trunk/drivers/gpu/drm/exynos/exynos_drm_fimd.c b/trunk/drivers/gpu/drm/exynos/exynos_drm_fimd.c
index 28733cd52745..1da741fc7460 100644
--- a/trunk/drivers/gpu/drm/exynos/exynos_drm_fimd.c
+++ b/trunk/drivers/gpu/drm/exynos/exynos_drm_fimd.c
@@ -570,10 +570,22 @@ static void fimd_win_disable(struct device *dev, int zpos)
 	win_data->enabled = false;
 }
 
+static void fimd_wait_for_vblank(struct device *dev)
+{
+	struct fimd_context *ctx = get_fimd_context(dev);
+	int ret;
+
+	ret = wait_for((__raw_readl(ctx->regs + VIDCON1) &
+					VIDCON1_VSTATUS_VSYNC), 50);
+	if (ret < 0)
+		DRM_DEBUG_KMS("vblank wait timed out.\n");
+}
+
 static struct exynos_drm_overlay_ops fimd_overlay_ops = {
 	.mode_set = fimd_win_mode_set,
 	.commit = fimd_win_commit,
 	.disable = fimd_win_disable,
+	.wait_for_vblank = fimd_wait_for_vblank,
 };
 
 static struct exynos_drm_manager fimd_manager = {