omapfb: Remove unused writeback code

Remove unused writeback code. This code will never be used, as omapfb is
being deprecated.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200313122410.7528-1-tomi.valkeinen@ti.com

diff --git a/drivers/video/fbdev/omap2/omapfb/dss/dispc.c b/drivers/video/fbdev/omap2/omapfb/dss/dispc.c
index ce37da85cc4587d980664774f91a4e260120d29c..4a16798b2ecd83efd390303813b92b22b4224d77 100644 (file)
--- a/drivers/video/fbdev/omap2/omapfb/dss/dispc.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/dispc.c
@@ -557,11 +557,6 @@ u32 dispc_mgr_get_sync_lost_irq(enum omap_channel channel)
 }
 EXPORT_SYMBOL(dispc_mgr_get_sync_lost_irq);
 
-u32 dispc_wb_get_framedone_irq(void)
-{
-       return DISPC_IRQ_FRAMEDONEWB;
-}
-
 bool dispc_mgr_go_busy(enum omap_channel channel)
 {
        return mgr_fld_read(channel, DISPC_MGR_FLD_GO) == 1;
@@ -579,30 +574,6 @@ void dispc_mgr_go(enum omap_channel channel)
 }
 EXPORT_SYMBOL(dispc_mgr_go);
 
-bool dispc_wb_go_busy(void)
-{
-       return REG_GET(DISPC_CONTROL2, 6, 6) == 1;
-}
-
-void dispc_wb_go(void)
-{
-       enum omap_plane plane = OMAP_DSS_WB;
-       bool enable, go;
-
-       enable = REG_GET(DISPC_OVL_ATTRIBUTES(plane), 0, 0) == 1;
-
-       if (!enable)
-               return;
-
-       go = REG_GET(DISPC_CONTROL2, 6, 6) == 1;
-       if (go) {
-               DSSERR("GO bit not down for WB\n");
-               return;
-       }
-
-       REG_FLD_MOD(DISPC_CONTROL2, 1, 6, 6);
-}
-
 static void dispc_ovl_write_firh_reg(enum omap_plane plane, int reg, u32 value)
 {
        dispc_write_reg(DISPC_OVL_FIR_COEF_H(plane, reg), value);
@@ -1028,13 +999,6 @@ static enum omap_channel dispc_ovl_get_channel_out(enum omap_plane plane)
        }
 }
 
-void dispc_wb_set_channel_in(enum dss_writeback_channel channel)
-{
-       enum omap_plane plane = OMAP_DSS_WB;
-
-       REG_FLD_MOD(DISPC_OVL_ATTRIBUTES(plane), channel, 18, 16);
-}
-
 static void dispc_ovl_set_burst_size(enum omap_plane plane,
                enum omap_burst_size burst_size)
 {
@@ -2805,74 +2769,6 @@ int dispc_ovl_setup(enum omap_plane plane, const struct omap_overlay_info *oi,
 }
 EXPORT_SYMBOL(dispc_ovl_setup);
 
-int dispc_wb_setup(const struct omap_dss_writeback_info *wi,
-               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 =
-               OMAP_DSS_OVL_CAP_SCALE | OMAP_DSS_OVL_CAP_PRE_MULT_ALPHA;
-
-       DSSDBG("dispc_wb_setup, pa %x, pa_uv %x, %d,%d -> %dx%d, cmode %x, "
-               "rot %d, mir %d\n", wi->paddr, wi->p_uv_addr, in_width,
-               in_height, wi->width, wi->height, wi->color_mode, wi->rotation,
-               wi->mirror);
-
-       r = dispc_ovl_setup_common(plane, caps, wi->paddr, wi->p_uv_addr,
-               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, 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 */
-       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;
-}
-
 int dispc_ovl_enable(enum omap_plane plane, bool enable)
 {
        DSSDBG("dispc_enable_plane %d, %d\n", plane, enable);
@@ -2903,16 +2799,6 @@ bool dispc_mgr_is_enabled(enum omap_channel channel)
 }
 EXPORT_SYMBOL(dispc_mgr_is_enabled);
 
-void dispc_wb_enable(bool enable)
-{
-       dispc_ovl_enable(OMAP_DSS_WB, enable);
-}
-
-bool dispc_wb_is_enabled(void)
-{
-       return dispc_ovl_enabled(OMAP_DSS_WB);
-}
-
 static void dispc_lcd_enable_signal_polarity(bool act_high)
 {
        if (!dss_has_feature(FEAT_LCDENABLEPOL))

diff --git a/drivers/video/fbdev/omap2/omapfb/dss/dss.h b/drivers/video/fbdev/omap2/omapfb/dss/dss.h
index a2269008590ff96de2133396a6a724ee6698529f..21cfcbf74a6d9d10fec2fb970570e73ffdbe7b91 100644 (file)
--- a/drivers/video/fbdev/omap2/omapfb/dss/dss.h
+++ b/drivers/video/fbdev/omap2/omapfb/dss/dss.h
@@ -89,17 +89,6 @@ enum dss_dsi_content_type {
        DSS_DSI_CONTENT_GENERIC,
 };
 
-enum dss_writeback_channel {
-       DSS_WB_LCD1_MGR =       0,
-       DSS_WB_LCD2_MGR =       1,
-       DSS_WB_TV_MGR =         2,
-       DSS_WB_OVL0 =           3,
-       DSS_WB_OVL1 =           4,
-       DSS_WB_OVL2 =           5,
-       DSS_WB_OVL3 =           6,
-       DSS_WB_LCD3_MGR =       7,
-};
-
 enum dss_pll_id {
        DSS_PLL_DSI1,
        DSS_PLL_DSI2,
@@ -403,15 +392,6 @@ int dispc_mgr_get_clock_div(enum omap_channel channel,
                struct dispc_clock_info *cinfo);
 void dispc_set_tv_pclk(unsigned long pclk);
 
-u32 dispc_wb_get_framedone_irq(void);
-bool dispc_wb_go_busy(void);
-void dispc_wb_go(void);
-void dispc_wb_enable(bool enable);
-bool dispc_wb_is_enabled(void);
-void dispc_wb_set_channel_in(enum dss_writeback_channel channel);
-int dispc_wb_setup(const struct omap_dss_writeback_info *wi,
-               bool mem_to_mem, const struct omap_video_timings *timings);
-
 u32 dispc_read_irqstatus(void);
 void dispc_clear_irqstatus(u32 mask);
 u32 dispc_read_irqenable(void);