From: ChiHun Won Date: Mon, 28 May 2018 12:17:49 +0000 (+0900) Subject: Revert "[9610] fbdev: dpu20: fixed decon reg update timeout" X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=22e1206f3f14ce8adcbea6a5874c55d010c1bf20;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git Revert "[9610] fbdev: dpu20: fixed decon reg update timeout" reviewed This reverts commit dcd6df9d93ce7f50c9171473541d5e71aa62366e. Change-Id: Ic61af2126e43f4607a902614f92e81bff9c3adcb Signed-off-by: ChiHun Won --- diff --git a/drivers/video/fbdev/exynos/dpu20/decon_core.c b/drivers/video/fbdev/exynos/dpu20/decon_core.c index a11d85235768..2e68d907bd3b 100644 --- a/drivers/video/fbdev/exynos/dpu20/decon_core.c +++ b/drivers/video/fbdev/exynos/dpu20/decon_core.c @@ -567,7 +567,6 @@ static int _decon_enable(struct decon_device *decon, enum decon_state state) * DECON2(for DISPLAYPORT) start in winconfig */ decon_reg_start(decon->id, &psr); - decon_reg_update_req_and_unmask(decon->id, &psr); } } @@ -1747,9 +1746,6 @@ static int __decon_update_regs(struct decon_device *decon, struct decon_reg_data return -ETIMEDOUT; } - if (psr.trig_mode == DECON_HW_TRIG) - decon_reg_set_trigger(decon->id, &psr, DECON_TRIG_DISABLE); - /* TODO: check and wait until the required IDMA is free */ decon_reg_chmap_validate(decon, regs);