aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJoongMock Shin <jmock.shin@samsung.com>2012-12-22 03:49:27 -0500
committerInki Dae <inki.dae@samsung.com>2013-01-04 01:54:33 -0500
commitb5c0b5526a97ff5d9e72d1c5d460ca20257987ae (patch)
tree9a89f5ded0ed56e8dfd20ab2ba14db4ad32f0f6a /drivers
parent6fe891f669e3e065a99423d322edc4ea7593f248 (diff)
drm/exynos: remove color bar pattern operation.
This patch removes color bar pattern register because we don't use the register anymore. because it doesn't support color bar feature for writeback operation. camera driver only supports color bar feature. but IPP doesn't support camera driver. Signed-off-by: JoongMock Shin <jmock.shin@samsung.com> Signed-off-by: Eunchul Kim <chulspro.kim@samsung.com> Signed-off-by: Inki Dae <inki.dae@samsung.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/exynos/exynos_drm_fimc.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimc.c b/drivers/gpu/drm/exynos/exynos_drm_fimc.c
index 8cfc5a9d8f41..a99ceefcc286 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_fimc.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_fimc.c
@@ -163,17 +163,14 @@ struct fimc_context {
163 bool suspended; 163 bool suspended;
164}; 164};
165 165
166static void fimc_sw_reset(struct fimc_context *ctx, bool pattern) 166static void fimc_sw_reset(struct fimc_context *ctx)
167{ 167{
168 u32 cfg; 168 u32 cfg;
169 169
170 DRM_DEBUG_KMS("%s:pattern[%d]\n", __func__, pattern); 170 DRM_DEBUG_KMS("%s\n", __func__);
171 171
172 cfg = fimc_read(EXYNOS_CISRCFMT); 172 cfg = fimc_read(EXYNOS_CISRCFMT);
173 cfg |= EXYNOS_CISRCFMT_ITU601_8BIT; 173 cfg |= EXYNOS_CISRCFMT_ITU601_8BIT;
174 if (pattern)
175 cfg |= EXYNOS_CIGCTRL_TESTPATTERN_COLOR_BAR;
176
177 fimc_write(cfg, EXYNOS_CISRCFMT); 174 fimc_write(cfg, EXYNOS_CISRCFMT);
178 175
179 /* s/w reset */ 176 /* s/w reset */
@@ -1536,7 +1533,7 @@ static int fimc_ippdrv_reset(struct device *dev)
1536 DRM_DEBUG_KMS("%s\n", __func__); 1533 DRM_DEBUG_KMS("%s\n", __func__);
1537 1534
1538 /* reset h/w block */ 1535 /* reset h/w block */
1539 fimc_sw_reset(ctx, false); 1536 fimc_sw_reset(ctx);
1540 1537
1541 /* reset scaler capability */ 1538 /* reset scaler capability */
1542 memset(&ctx->sc, 0x0, sizeof(ctx->sc)); 1539 memset(&ctx->sc, 0x0, sizeof(ctx->sc));