aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrzej Hajda <a.hajda@samsung.com>2014-08-28 05:07:37 -0400
committerInki Dae <daeinki@gmail.com>2014-09-19 11:56:12 -0400
commitc7b3014bf90d91b0559b3b49f4c0acef7170ece6 (patch)
tree08621d3597603f2b24953905ee55d68e1a5056a5
parent7794a775f4c77428370e81f98d9c5fb587610498 (diff)
drm/exynos/fimc: do not enable fimc twice
The patch removes redundant H/W activation. Signed-off-by: Andrzej Hajda <a.hajda@samsung.com> Reviewed-by: Joonyoung Shim <jy0922.shim@samsung.com> Signed-off-by: Inki Dae <inki.dae@samsung.com>
-rw-r--r--drivers/gpu/drm/exynos/exynos_drm_fimc.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimc.c b/drivers/gpu/drm/exynos/exynos_drm_fimc.c
index c55c501f899c..15d04d554fca 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_fimc.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_fimc.c
@@ -1587,12 +1587,9 @@ static int fimc_ippdrv_start(struct device *dev, enum drm_exynos_ipp_cmd cmd)
1587 1587
1588 fimc_clear_bits(ctx, EXYNOS_CIOCTRL, EXYNOS_CIOCTRL_WEAVE_MASK); 1588 fimc_clear_bits(ctx, EXYNOS_CIOCTRL, EXYNOS_CIOCTRL_WEAVE_MASK);
1589 1589
1590 if (cmd == IPP_CMD_M2M) { 1590 if (cmd == IPP_CMD_M2M)
1591 fimc_set_bits(ctx, EXYNOS_MSCTRL, EXYNOS_MSCTRL_ENVID); 1591 fimc_set_bits(ctx, EXYNOS_MSCTRL, EXYNOS_MSCTRL_ENVID);
1592 1592
1593 fimc_set_bits(ctx, EXYNOS_MSCTRL, EXYNOS_MSCTRL_ENVID);
1594 }
1595
1596 return 0; 1593 return 0;
1597} 1594}
1598 1595