From: Sanghoon Lee Date: Tue, 26 Jun 2018 07:50:59 +0000 (+0900) Subject: [COMMON] fimc-is2: Skip the vertical down-scaling scenario for DJAG X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f16bb1e7ffde5282ed84586208fab5371ed38cb9;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git [COMMON] fimc-is2: Skip the vertical down-scaling scenario for DJAG DJAG should not be enabled for the purpose of down-scaling, even for vertical direction. Change-Id: I6167aa6a5e976358d694810ea7f98369edc703e2 Signed-off-by: Sanghoon Lee --- diff --git a/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-djag.c b/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-djag.c index 73e1f7b1b340..db1cb73c9e4e 100644 --- a/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-djag.c +++ b/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-djag.c @@ -154,10 +154,10 @@ int fimc_is_hw_mcsc_update_djag_register(struct fimc_is_hw_ip *hw_ip, } } - if (param->input.width > out_width) { - sdbg_hw(2, "DJAG is not applied still.(input : %d > output : %d)\n", hw_ip, - param->input.width, - out_width); + if (param->input.width > out_width || param->input.height > out_height) { + sdbg_hw(2, "DJAG is not applied still.(input : %dx%d > output : %dx%d)\n", hw_ip, + param->input.width, param->input.height, + out_width, out_height); fimc_is_scaler_set_djag_enable(hw_ip->regs, 0); return ret; }