OMAP: DSS2: Remove support for non-DISPC overlays
authorTomi Valkeinen <tomi.valkeinen@ti.com>
Mon, 15 Aug 2011 08:22:21 +0000 (11:22 +0300)
committerTomi Valkeinen <tomi.valkeinen@ti.com>
Fri, 30 Sep 2011 13:16:20 +0000 (16:16 +0300)
Remove support for non-DISPC overlays and overlay managers.

The support to possibly have non-DISPC overlays and managers was made to
make it possible to use CPU and/or sDMA to update RFBI or DSI command
mode displays. It is ok to remove the support, because:

- No one has used the feature.
- Display update without DISPC is very slow, so it is debatable if the
  update would even be usable.
- Removal cleans up code.
- If such a feature is needed later, it is better implemented outside
  omapdss driver.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Acked-by: Archit Taneja <archit@ti.com>
drivers/video/omap2/dss/dispc.c
drivers/video/omap2/dss/dsi.c
drivers/video/omap2/dss/manager.c
drivers/video/omap2/dss/overlay.c
drivers/video/omap2/dss/rfbi.c
include/video/omapdss.h

index 003227c82b3f2c7aaf63021cb458194960e1e381..43dbfb1da7785d74c0dcf7ac3795057f047a0e5a 100644 (file)
@@ -3058,9 +3058,6 @@ static void dispc_error_worker(struct work_struct *work)
                        struct omap_overlay *ovl;
                        ovl = omap_dss_get_overlay(i);
 
-                       if (!(ovl->caps & OMAP_DSS_OVL_CAP_DISPC))
-                               continue;
-
                        if (ovl->id == 0) {
                                dispc_enable_plane(ovl->id, 0);
                                dispc_go(ovl->manager->id);
@@ -3076,9 +3073,6 @@ static void dispc_error_worker(struct work_struct *work)
                        struct omap_overlay *ovl;
                        ovl = omap_dss_get_overlay(i);
 
-                       if (!(ovl->caps & OMAP_DSS_OVL_CAP_DISPC))
-                               continue;
-
                        if (ovl->id == 1) {
                                dispc_enable_plane(ovl->id, 0);
                                dispc_go(ovl->manager->id);
@@ -3094,9 +3088,6 @@ static void dispc_error_worker(struct work_struct *work)
                        struct omap_overlay *ovl;
                        ovl = omap_dss_get_overlay(i);
 
-                       if (!(ovl->caps & OMAP_DSS_OVL_CAP_DISPC))
-                               continue;
-
                        if (ovl->id == 2) {
                                dispc_enable_plane(ovl->id, 0);
                                dispc_go(ovl->manager->id);
@@ -3131,9 +3122,6 @@ static void dispc_error_worker(struct work_struct *work)
                                struct omap_overlay *ovl;
                                ovl = omap_dss_get_overlay(i);
 
-                               if (!(ovl->caps & OMAP_DSS_OVL_CAP_DISPC))
-                                       continue;
-
                                if (ovl->id != 0 && ovl->manager == manager)
                                        dispc_enable_plane(ovl->id, 0);
                        }
@@ -3170,9 +3158,6 @@ static void dispc_error_worker(struct work_struct *work)
                                struct omap_overlay *ovl;
                                ovl = omap_dss_get_overlay(i);
 
-                               if (!(ovl->caps & OMAP_DSS_OVL_CAP_DISPC))
-                                       continue;
-
                                if (ovl->id != 0 && ovl->manager == manager)
                                        dispc_enable_plane(ovl->id, 0);
                        }
@@ -3209,9 +3194,6 @@ static void dispc_error_worker(struct work_struct *work)
                                struct omap_overlay *ovl;
                                ovl = omap_dss_get_overlay(i);
 
-                               if (!(ovl->caps & OMAP_DSS_OVL_CAP_DISPC))
-                                       continue;
-
                                if (ovl->id != 0 && ovl->manager == manager)
                                        dispc_enable_plane(ovl->id, 0);
                        }
@@ -3228,9 +3210,7 @@ static void dispc_error_worker(struct work_struct *work)
                for (i = 0; i < omap_dss_get_num_overlay_managers(); ++i) {
                        struct omap_overlay_manager *mgr;
                        mgr = omap_dss_get_overlay_manager(i);
-
-                       if (mgr->caps & OMAP_DSS_OVL_CAP_DISPC)
-                               mgr->device->driver->disable(mgr->device);
+                       mgr->device->driver->disable(mgr->device);
                }
        }
 
index c951a75e70218458285d50c9ace919d147ef474f..bd0ff1d64497cdde83cdeca014d341c84c33c90b 100644 (file)
@@ -3648,161 +3648,6 @@ static void dsi_proto_timings(struct omap_dss_device *dssdev)
                        enter_hs_mode_lat, exit_hs_mode_lat);
 }
 
-
-#define DSI_DECL_VARS \
-       int __dsi_cb = 0; u32 __dsi_cv = 0;
-
-#define DSI_FLUSH(dsidev, ch) \
-       if (__dsi_cb > 0) { \
-               /*DSSDBG("sending long packet %#010x\n", __dsi_cv);*/ \
-               dsi_write_reg(dsidev, DSI_VC_LONG_PACKET_PAYLOAD(ch), __dsi_cv); \
-               __dsi_cb = __dsi_cv = 0; \
-       }
-
-#define DSI_PUSH(dsidev, ch, data) \
-       do { \
-               __dsi_cv |= (data) << (__dsi_cb * 8); \
-               /*DSSDBG("cv = %#010x, cb = %d\n", __dsi_cv, __dsi_cb);*/ \
-               if (++__dsi_cb > 3) \
-                       DSI_FLUSH(dsidev, ch); \
-       } while (0)
-
-static int dsi_update_screen_l4(struct omap_dss_device *dssdev,
-                       int x, int y, int w, int h)
-{
-       /* Note: supports only 24bit colors in 32bit container */
-       struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);
-       struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);
-       int first = 1;
-       int fifo_stalls = 0;
-       int max_dsi_packet_size;
-       int max_data_per_packet;
-       int max_pixels_per_packet;
-       int pixels_left;
-       int bytespp = dssdev->ctrl.pixel_size / 8;
-       int scr_width;
-       u32 __iomem *data;
-       int start_offset;
-       int horiz_inc;
-       int current_x;
-       struct omap_overlay *ovl;
-
-       debug_irq = 0;
-
-       DSSDBG("dsi_update_screen_l4 (%d,%d %dx%d)\n",
-                       x, y, w, h);
-
-       ovl = dssdev->manager->overlays[0];
-
-       if (ovl->info.color_mode != OMAP_DSS_COLOR_RGB24U)
-               return -EINVAL;
-
-       if (dssdev->ctrl.pixel_size != 24)
-               return -EINVAL;
-
-       scr_width = ovl->info.screen_width;
-       data = ovl->info.vaddr;
-
-       start_offset = scr_width * y + x;
-       horiz_inc = scr_width - w;
-       current_x = x;
-
-       /* We need header(4) + DCSCMD(1) + pixels(numpix*bytespp) bytes
-        * in fifo */
-
-       /* When using CPU, max long packet size is TX buffer size */
-       max_dsi_packet_size = dsi->vc[0].fifo_size * 32 * 4;
-
-       /* we seem to get better perf if we divide the tx fifo to half,
-          and while the other half is being sent, we fill the other half
-          max_dsi_packet_size /= 2; */
-
-       max_data_per_packet = max_dsi_packet_size - 4 - 1;
-
-       max_pixels_per_packet = max_data_per_packet / bytespp;
-
-       DSSDBG("max_pixels_per_packet %d\n", max_pixels_per_packet);
-
-       pixels_left = w * h;
-
-       DSSDBG("total pixels %d\n", pixels_left);
-
-       data += start_offset;
-
-       while (pixels_left > 0) {
-               /* 0x2c = write_memory_start */
-               /* 0x3c = write_memory_continue */
-               u8 dcs_cmd = first ? 0x2c : 0x3c;
-               int pixels;
-               DSI_DECL_VARS;
-               first = 0;
-
-#if 1
-               /* using fifo not empty */
-               /* TX_FIFO_NOT_EMPTY */
-               while (FLD_GET(dsi_read_reg(dsidev, DSI_VC_CTRL(0)), 5, 5)) {
-                       fifo_stalls++;
-                       if (fifo_stalls > 0xfffff) {
-                               DSSERR("fifo stalls overflow, pixels left %d\n",
-                                               pixels_left);
-                               dsi_if_enable(dsidev, 0);
-                               return -EIO;
-                       }
-                       udelay(1);
-               }
-#elif 1
-               /* using fifo emptiness */
-               while ((REG_GET(dsidev, DSI_TX_FIFO_VC_EMPTINESS, 7, 0)+1)*4 <
-                               max_dsi_packet_size) {
-                       fifo_stalls++;
-                       if (fifo_stalls > 0xfffff) {
-                               DSSERR("fifo stalls overflow, pixels left %d\n",
-                                              pixels_left);
-                               dsi_if_enable(dsidev, 0);
-                               return -EIO;
-                       }
-               }
-#else
-               while ((REG_GET(dsidev, DSI_TX_FIFO_VC_EMPTINESS,
-                               7, 0) + 1) * 4 == 0) {
-                       fifo_stalls++;
-                       if (fifo_stalls > 0xfffff) {
-                               DSSERR("fifo stalls overflow, pixels left %d\n",
-                                              pixels_left);
-                               dsi_if_enable(dsidev, 0);
-                               return -EIO;
-                       }
-               }
-#endif
-               pixels = min(max_pixels_per_packet, pixels_left);
-
-               pixels_left -= pixels;
-
-               dsi_vc_write_long_header(dsidev, 0, DSI_DT_DCS_LONG_WRITE,
-                               1 + pixels * bytespp, 0);
-
-               DSI_PUSH(dsidev, 0, dcs_cmd);
-
-               while (pixels-- > 0) {
-                       u32 pix = __raw_readl(data++);
-
-                       DSI_PUSH(dsidev, 0, (pix >> 16) & 0xff);
-                       DSI_PUSH(dsidev, 0, (pix >> 8) & 0xff);
-                       DSI_PUSH(dsidev, 0, (pix >> 0) & 0xff);
-
-                       current_x++;
-                       if (current_x == x+w) {
-                               current_x = x;
-                               data += horiz_inc;
-                       }
-               }
-
-               DSI_FLUSH(dsidev, 0);
-       }
-
-       return 0;
-}
-
 static void dsi_update_screen_dispc(struct omap_dss_device *dssdev,
                u16 x, u16 y, u16 w, u16 h)
 {
@@ -3970,11 +3815,9 @@ int omap_dsi_prepare_update(struct omap_dss_device *dssdev,
 
        dsi_perf_mark_setup(dsidev);
 
-       if (dssdev->manager->caps & OMAP_DSS_OVL_MGR_CAP_DISPC) {
-               dss_setup_partial_planes(dssdev, x, y, w, h,
-                               enlarge_update_area);
-               dispc_set_lcd_size(dssdev->manager->id, *w, *h);
-       }
+       dss_setup_partial_planes(dssdev, x, y, w, h,
+                       enlarge_update_area);
+       dispc_set_lcd_size(dssdev->manager->id, *w, *h);
 
        return 0;
 }
@@ -3996,27 +3839,16 @@ int omap_dsi_update(struct omap_dss_device *dssdev,
         * see rather obscure HW error happening, as DSS halts. */
        BUG_ON(x % 2 == 1);
 
-       if (dssdev->manager->caps & OMAP_DSS_OVL_MGR_CAP_DISPC) {
-               dsi->framedone_callback = callback;
-               dsi->framedone_data = data;
-
-               dsi->update_region.x = x;
-               dsi->update_region.y = y;
-               dsi->update_region.w = w;
-               dsi->update_region.h = h;
-               dsi->update_region.device = dssdev;
-
-               dsi_update_screen_dispc(dssdev, x, y, w, h);
-       } else {
-               int r;
+       dsi->framedone_callback = callback;
+       dsi->framedone_data = data;
 
-               r = dsi_update_screen_l4(dssdev, x, y, w, h);
-               if (r)
-                       return r;
+       dsi->update_region.x = x;
+       dsi->update_region.y = y;
+       dsi->update_region.w = w;
+       dsi->update_region.h = h;
+       dsi->update_region.device = dssdev;
 
-               dsi_perf_show(dsidev, "L4");
-               callback(0, data);
-       }
+       dsi_update_screen_dispc(dssdev, x, y, w, h);
 
        return 0;
 }
index a6a909ae86701097fb14b8340ce6a5452216c585..72e041b3a66ef3055380e88be1e65ddadc33dfce 100644 (file)
@@ -1333,9 +1333,6 @@ static int omap_dss_mgr_apply(struct omap_overlay_manager *mgr)
 
                ovl = omap_dss_get_overlay(i);
 
-               if (!(ovl->caps & OMAP_DSS_OVL_CAP_DISPC))
-                       continue;
-
                oc = &dss_cache.overlay_cache[ovl->id];
 
                if (ovl->manager_changed) {
@@ -1387,9 +1384,6 @@ static int omap_dss_mgr_apply(struct omap_overlay_manager *mgr)
        list_for_each_entry(mgr, &manager_list, list) {
                struct omap_dss_device *dssdev;
 
-               if (!(mgr->caps & OMAP_DSS_OVL_MGR_CAP_DISPC))
-                       continue;
-
                mc = &dss_cache.manager_cache[mgr->id];
 
                if (mgr->device_changed) {
@@ -1435,9 +1429,6 @@ static int omap_dss_mgr_apply(struct omap_overlay_manager *mgr)
 
                ovl = omap_dss_get_overlay(i);
 
-               if (!(ovl->caps & OMAP_DSS_OVL_CAP_DISPC))
-                       continue;
-
                oc = &dss_cache.overlay_cache[ovl->id];
 
                if (!oc->enabled)
@@ -1592,7 +1583,7 @@ int dss_init_overlay_managers(struct platform_device *pdev)
                mgr->enable = &dss_mgr_enable;
                mgr->disable = &dss_mgr_disable;
 
-               mgr->caps = OMAP_DSS_OVL_MGR_CAP_DISPC;
+               mgr->caps = 0;
                mgr->supported_displays =
                        dss_feat_get_supported_displays(mgr->id);
 
@@ -1609,42 +1600,6 @@ int dss_init_overlay_managers(struct platform_device *pdev)
                }
        }
 
-#ifdef L4_EXAMPLE
-       {
-               int omap_dss_mgr_apply_l4(struct omap_overlay_manager *mgr)
-               {
-                       DSSDBG("omap_dss_mgr_apply_l4(%s)\n", mgr->name);
-
-                       return 0;
-               }
-
-               struct omap_overlay_manager *mgr;
-               mgr = kzalloc(sizeof(*mgr), GFP_KERNEL);
-
-               BUG_ON(mgr == NULL);
-
-               mgr->name = "l4";
-               mgr->supported_displays =
-                       OMAP_DISPLAY_TYPE_DBI | OMAP_DISPLAY_TYPE_DSI;
-
-               mgr->set_device = &omap_dss_set_device;
-               mgr->unset_device = &omap_dss_unset_device;
-               mgr->apply = &omap_dss_mgr_apply_l4;
-               mgr->set_manager_info = &omap_dss_mgr_set_info;
-               mgr->get_manager_info = &omap_dss_mgr_get_info;
-
-               dss_overlay_setup_l4_manager(mgr);
-
-               omap_dss_add_overlay_manager(mgr);
-
-               r = kobject_init_and_add(&mgr->kobj, &manager_ktype,
-                               &pdev->dev.kobj, "managerl4");
-
-               if (r)
-                       DSSERR("failed to create sysfs file\n");
-       }
-#endif
-
        return 0;
 }
 
index ab444036146b923a37c0395b256b1525869d036c..0b21af95b48c3786907b997b34184382800c32f8 100644 (file)
@@ -613,21 +613,19 @@ void dss_init_overlays(struct platform_device *pdev)
                case 0:
                        ovl->name = "gfx";
                        ovl->id = OMAP_DSS_GFX;
-                       ovl->caps = OMAP_DSS_OVL_CAP_DISPC;
+                       ovl->caps = 0;
                        ovl->info.global_alpha = 255;
                        break;
                case 1:
                        ovl->name = "vid1";
                        ovl->id = OMAP_DSS_VIDEO1;
-                       ovl->caps = OMAP_DSS_OVL_CAP_SCALE |
-                               OMAP_DSS_OVL_CAP_DISPC;
+                       ovl->caps = OMAP_DSS_OVL_CAP_SCALE;
                        ovl->info.global_alpha = 255;
                        break;
                case 2:
                        ovl->name = "vid2";
                        ovl->id = OMAP_DSS_VIDEO2;
-                       ovl->caps = OMAP_DSS_OVL_CAP_SCALE |
-                               OMAP_DSS_OVL_CAP_DISPC;
+                       ovl->caps = OMAP_DSS_OVL_CAP_SCALE;
                        ovl->info.global_alpha = 255;
                        break;
                }
index 50394badec15c1857bc3716e6e937b4d39c5bde1..b605066c176b6ed1742626dc8d274908c3c537b0 100644 (file)
@@ -783,10 +783,8 @@ int omap_rfbi_prepare_update(struct omap_dss_device *dssdev,
        if (*w == 0 || *h == 0)
                return -EINVAL;
 
-       if (dssdev->manager->caps & OMAP_DSS_OVL_MGR_CAP_DISPC) {
-               dss_setup_partial_planes(dssdev, x, y, w, h, true);
-               dispc_set_lcd_size(dssdev->manager->id, *w, *h);
-       }
+       dss_setup_partial_planes(dssdev, x, y, w, h, true);
+       dispc_set_lcd_size(dssdev->manager->id, *w, *h);
 
        return 0;
 }
@@ -796,22 +794,7 @@ int omap_rfbi_update(struct omap_dss_device *dssdev,
                u16 x, u16 y, u16 w, u16 h,
                void (*callback)(void *), void *data)
 {
-       if (dssdev->manager->caps & OMAP_DSS_OVL_MGR_CAP_DISPC) {
-               rfbi_transfer_area(dssdev, w, h, callback, data);
-       } else {
-               struct omap_overlay *ovl;
-               void __iomem *addr;
-               int scr_width;
-
-               ovl = dssdev->manager->overlays[0];
-               scr_width = ovl->info.screen_width;
-               addr = ovl->info.vaddr;
-
-               omap_rfbi_write_pixels(addr, scr_width, x, y, w, h);
-
-               callback(data);
-       }
-
+       rfbi_transfer_area(dssdev, w, h, callback, data);
        return 0;
 }
 EXPORT_SYMBOL(omap_rfbi_update);
index ecde53f71bd2680f3df15b65cd911a6074affc99..cb1ff1a6b5ee16941848b03fc1a13cde7bddec5d 100644 (file)
@@ -162,11 +162,10 @@ enum omap_dss_rotation_angle {
 
 enum omap_overlay_caps {
        OMAP_DSS_OVL_CAP_SCALE = 1 << 0,
-       OMAP_DSS_OVL_CAP_DISPC = 1 << 1,
 };
 
 enum omap_overlay_manager_caps {
-       OMAP_DSS_OVL_MGR_CAP_DISPC = 1 << 0,
+       OMAP_DSS_DUMMY_VALUE, /* add a dummy value to prevent compiler error */
 };
 
 enum omap_dss_clk_source {
@@ -325,7 +324,7 @@ struct omap_overlay {
 
        /* static fields */
        const char *name;
-       int id;
+       enum omap_plane id;
        enum omap_color_mode supported_modes;
        enum omap_overlay_caps caps;
 
@@ -368,7 +367,7 @@ struct omap_overlay_manager {
 
        /* static fields */
        const char *name;
-       int id;
+       enum omap_channel id;
        enum omap_overlay_manager_caps caps;
        int num_overlays;
        struct omap_overlay **overlays;