From 97983c568697fd4e3f17a83d05308a9aa01ad914 Mon Sep 17 00:00:00 2001
From: JoongMock Shin <jmock.shin@samsung.com>
Date: Sat, 22 Dec 2012 17:49:27 +0900
Subject: [PATCH] --- yaml --- r: 348425 b: refs/heads/master c:
 b5c0b5526a97ff5d9e72d1c5d460ca20257987ae h: refs/heads/master i:   348423:
 087d946bb9907dc20e0288ed6075c1804528375d v: v3

---
 [refs]                                         | 2 +-
 trunk/drivers/gpu/drm/exynos/exynos_drm_fimc.c | 9 +++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 3252b00dfca1..924e82789326 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6fe891f669e3e065a99423d322edc4ea7593f248
+refs/heads/master: b5c0b5526a97ff5d9e72d1c5d460ca20257987ae
diff --git a/trunk/drivers/gpu/drm/exynos/exynos_drm_fimc.c b/trunk/drivers/gpu/drm/exynos/exynos_drm_fimc.c
index 8cfc5a9d8f41..a99ceefcc286 100644
--- a/trunk/drivers/gpu/drm/exynos/exynos_drm_fimc.c
+++ b/trunk/drivers/gpu/drm/exynos/exynos_drm_fimc.c
@@ -163,17 +163,14 @@ struct fimc_context {
 	bool	suspended;
 };
 
-static void fimc_sw_reset(struct fimc_context *ctx, bool pattern)
+static void fimc_sw_reset(struct fimc_context *ctx)
 {
 	u32 cfg;
 
-	DRM_DEBUG_KMS("%s:pattern[%d]\n", __func__, pattern);
+	DRM_DEBUG_KMS("%s\n", __func__);
 
 	cfg = fimc_read(EXYNOS_CISRCFMT);
 	cfg |= EXYNOS_CISRCFMT_ITU601_8BIT;
-	if (pattern)
-		cfg |= EXYNOS_CIGCTRL_TESTPATTERN_COLOR_BAR;
-
 	fimc_write(cfg, EXYNOS_CISRCFMT);
 
 	/* s/w reset */
@@ -1536,7 +1533,7 @@ static int fimc_ippdrv_reset(struct device *dev)
 	DRM_DEBUG_KMS("%s\n", __func__);
 
 	/* reset h/w block */
-	fimc_sw_reset(ctx, false);
+	fimc_sw_reset(ctx);
 
 	/* reset scaler capability */
 	memset(&ctx->sc, 0x0, sizeof(ctx->sc));