From: Andrzej Hajda Date: Thu, 28 Aug 2014 09:07:37 +0000 (+0200) Subject: drm/exynos/fimc: do not enable fimc twice X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c7b3014bf90d91b0559b3b49f4c0acef7170ece6;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git drm/exynos/fimc: do not enable fimc twice The patch removes redundant H/W activation. Signed-off-by: Andrzej Hajda Reviewed-by: Joonyoung Shim Signed-off-by: Inki Dae --- 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) fimc_clear_bits(ctx, EXYNOS_CIOCTRL, EXYNOS_CIOCTRL_WEAVE_MASK); - if (cmd == IPP_CMD_M2M) { + if (cmd == IPP_CMD_M2M) fimc_set_bits(ctx, EXYNOS_MSCTRL, EXYNOS_MSCTRL_ENVID); - fimc_set_bits(ctx, EXYNOS_MSCTRL, EXYNOS_MSCTRL_ENVID); - } - return 0; }