OMAPDSS: add setup for WB capture mode in dispc_wb_setup()

dispc_wb_setup() handles configuration only for mem-to-mem case. This
patch adds the necessary configuration to handle also display capture
mode.

We need to set CAPTUREMODE to 0 (continuous capture), and WBDELAYCOUNT
according to the vertical timings of the display, so that the WB FIFO
has time to flush before the next frame starts.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

diff --git a/drivers/video/fbdev/omap2/dss/dispc.c b/drivers/video/fbdev/omap2/dss/dispc.c
index 6018518c1b25595c5b3f6f2851b16a0f4b50236d..c3ba555737b87a793123fc8b0637ce75f8564a96 100644 (file)
--- a/drivers/video/fbdev/omap2/dss/dispc.c
+++ b/drivers/video/fbdev/omap2/dss/dispc.c
@@ -2859,8 +2859,23 @@ int dispc_wb_setup(const struct omap_dss_writeback_info *wi,
        l = FLD_MOD(l, mem_to_mem, 19, 19);     /* WRITEBACKMODE */
        if (mem_to_mem)
                l = FLD_MOD(l, 1, 26, 24);      /* CAPTUREMODE */
+       else
+               l = FLD_MOD(l, 0, 26, 24);      /* CAPTUREMODE */
        dispc_write_reg(DISPC_OVL_ATTRIBUTES(plane), l);
 
+       if (mem_to_mem) {
+               /* WBDELAYCOUNT */
+               REG_FLD_MOD(DISPC_OVL_ATTRIBUTES2(plane), 0, 7, 0);
+       } else {
+               int wbdelay;
+
+               wbdelay = min(mgr_timings->vfp + mgr_timings->vsw +
+                       mgr_timings->vbp, 255);
+
+               /* WBDELAYCOUNT */
+               REG_FLD_MOD(DISPC_OVL_ATTRIBUTES2(plane), wbdelay, 7, 0);
+       }
+
        return r;
 }