[9610] fbdev: dpu20: fixed decon reg update timeout
authorChiHun Won <chihun.won@samsung.com>
Thu, 17 May 2018 02:20:26 +0000 (11:20 +0900)
committerSangwook Ju <sw.ju@samsung.com>
Thu, 17 May 2018 10:56:14 +0000 (19:56 +0900)
Change-Id: I5dbdbb4c6309e75a65af402a5eb888df5ceb619d
Signed-off-by: ChiHun Won <chihun.won@samsung.com>
drivers/video/fbdev/exynos/dpu20/decon_core.c

index 5f7a30623ede1eb6170b047df5edbf149b1f2ade..ec9df371604f9abf6ab78107f3ee94ee0eacd141 100644 (file)
@@ -567,6 +567,7 @@ 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);
                }
        }
 
@@ -1733,6 +1734,9 @@ 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);