OMAPDSS: DISPC: Configure writeback specific parameters in dispc_wb_setup()

Configure some of the writeback specific parameters in dispc_wb_setup(). The
writeback parameters configured are:

truncation: This needs to be set if the color depth input to writeback is more
than the color depth of the color mode we want to store in memory.

writeback mode: This configures whether we want to use writeback in mem to mem
or capture mode. This information will be directly passed by APPLY later.

Signed-off-by: Archit Taneja <archit@ti.com>

diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c
index 4d8e04583873f495f61c346f0213573a7a5c2195..9f083a952747d9325dbf5667e189307095455366 100644 (file)
--- a/drivers/video/omap2/dss/dispc.c
+++ b/drivers/video/omap2/dss/dispc.c
@@ -2482,13 +2482,15 @@ int dispc_ovl_setup(enum omap_plane plane, const struct omap_overlay_info *oi,
 }
 
 int dispc_wb_setup(const struct omap_dss_writeback_info *wi,
-               const struct omap_video_timings *mgr_timings)
+               bool mem_to_mem, const struct omap_video_timings *mgr_timings)
 {
        int r;
+       u32 l;
        enum omap_plane plane = OMAP_DSS_WB;
        const int pos_x = 0, pos_y = 0;
        const u8 zorder = 0, global_alpha = 0;
        const bool replication = false;
+       bool truncation;
        int in_width = mgr_timings->x_res;
        int in_height = mgr_timings->y_res;
        enum omap_overlay_caps caps =
@@ -2503,7 +2505,29 @@ int dispc_wb_setup(const struct omap_dss_writeback_info *wi,
                wi->buf_width, pos_x, pos_y, in_width, in_height, wi->width,
                wi->height, wi->color_mode, wi->rotation, wi->mirror, zorder,
                wi->pre_mult_alpha, global_alpha, wi->rotation_type,
-               replication, mgr_timings, false);
+               replication, mgr_timings, mem_to_mem);
+
+       switch (wi->color_mode) {
+       case OMAP_DSS_COLOR_RGB16:
+       case OMAP_DSS_COLOR_RGB24P:
+       case OMAP_DSS_COLOR_ARGB16:
+       case OMAP_DSS_COLOR_RGBA16:
+       case OMAP_DSS_COLOR_RGB12U:
+       case OMAP_DSS_COLOR_ARGB16_1555:
+       case OMAP_DSS_COLOR_XRGB16_1555:
+       case OMAP_DSS_COLOR_RGBX16:
+               truncation = true;
+               break;
+       default:
+               truncation = false;
+               break;
+       }
+
+       /* setup extra DISPC_WB_ATTRIBUTES */
+       l = dispc_read_reg(DISPC_OVL_ATTRIBUTES(plane));
+       l = FLD_MOD(l, truncation, 10, 10);     /* TRUNCATIONENABLE */
+       l = FLD_MOD(l, mem_to_mem, 19, 19);     /* WRITEBACKMODE */
+       dispc_write_reg(DISPC_OVL_ATTRIBUTES(plane), l);
 
        return r;
 }

diff --git a/drivers/video/omap2/dss/dss.h b/drivers/video/omap2/dss/dss.h
index 3f9208e8820391afc64e1fe38981d90bd6f2b50c..8677f5157318507b207002e8af252ecfa3afc86a 100644 (file)
--- a/drivers/video/omap2/dss/dss.h
+++ b/drivers/video/omap2/dss/dss.h
@@ -488,7 +488,7 @@ void dispc_mgr_setup(enum omap_channel channel,
 
 void dispc_wb_set_channel_in(enum dss_writeback_channel channel);
 int dispc_wb_setup(const struct omap_dss_writeback_info *wi,
-               const struct omap_video_timings *timings);
+               bool mem_to_mem, const struct omap_video_timings *timings);
 
 /* VENC */
 #ifdef CONFIG_OMAP2_DSS_VENC