1 files changed, 61 insertions, 29 deletions

diff --git a/drivers/video/omap2/dss/output.c b/drivers/video/omap2/dss/output.c
index 813f26682b7a..79dea1a1a732 100644
--- a/drivers/video/omap2/dss/output.c
+++ b/drivers/video/omap2/dss/output.c
@@ -114,35 +114,67 @@ struct omap_dss_output *omap_dss_get_output(enum omap_dss_output_id id)
         return NULL;
 }
 
-struct omap_dss_output *omapdss_get_output_from_dssdev(struct omap_dss_device *dssdev)
+static const struct dss_mgr_ops *dss_mgr_ops;
+
+int dss_install_mgr_ops(const struct dss_mgr_ops *mgr_ops)
 {
-        struct omap_dss_output *out = NULL;
-        enum omap_dss_output_id id;
-
-        switch (dssdev->type) {
-        case OMAP_DISPLAY_TYPE_DPI:
-                out = omap_dss_get_output(OMAP_DSS_OUTPUT_DPI);
-                break;
-        case OMAP_DISPLAY_TYPE_DBI:
-                out = omap_dss_get_output(OMAP_DSS_OUTPUT_DBI);
-                break;
-        case OMAP_DISPLAY_TYPE_SDI:
-                out = omap_dss_get_output(OMAP_DSS_OUTPUT_SDI);
-                break;
-        case OMAP_DISPLAY_TYPE_VENC:
-                out = omap_dss_get_output(OMAP_DSS_OUTPUT_VENC);
-                break;
-        case OMAP_DISPLAY_TYPE_HDMI:
-                out = omap_dss_get_output(OMAP_DSS_OUTPUT_HDMI);
-                break;
-        case OMAP_DISPLAY_TYPE_DSI:
-                id = dssdev->phy.dsi.module == 0 ? OMAP_DSS_OUTPUT_DSI1 :
-                                        OMAP_DSS_OUTPUT_DSI2;
-                out = omap_dss_get_output(id);
-                break;
-        default:
-                break;
-        }
+        if (dss_mgr_ops)
+                return -EBUSY;
+
+        dss_mgr_ops = mgr_ops;
+
+        return 0;
+}
+EXPORT_SYMBOL(dss_install_mgr_ops);
+
+void dss_uninstall_mgr_ops(void)
+{
+        dss_mgr_ops = NULL;
+}
+EXPORT_SYMBOL(dss_uninstall_mgr_ops);
+
+void dss_mgr_set_timings(struct omap_overlay_manager *mgr,
+                const struct omap_video_timings *timings)
+{
+        dss_mgr_ops->set_timings(mgr, timings);
+}
+EXPORT_SYMBOL(dss_mgr_set_timings);
+
+void dss_mgr_set_lcd_config(struct omap_overlay_manager *mgr,
+                const struct dss_lcd_mgr_config *config)
+{
+        dss_mgr_ops->set_lcd_config(mgr, config);
+}
+EXPORT_SYMBOL(dss_mgr_set_lcd_config);
+
+int dss_mgr_enable(struct omap_overlay_manager *mgr)
+{
+        return dss_mgr_ops->enable(mgr);
+}
+EXPORT_SYMBOL(dss_mgr_enable);
+
+void dss_mgr_disable(struct omap_overlay_manager *mgr)
+{
+        dss_mgr_ops->disable(mgr);
+}
+EXPORT_SYMBOL(dss_mgr_disable);
 
-        return out;
+void dss_mgr_start_update(struct omap_overlay_manager *mgr)
+{
+        dss_mgr_ops->start_update(mgr);
+}
+EXPORT_SYMBOL(dss_mgr_start_update);
+
+int dss_mgr_register_framedone_handler(struct omap_overlay_manager *mgr,
+                void (*handler)(void *), void *data)
+{
+        return dss_mgr_ops->register_framedone_handler(mgr, handler, data);
+}
+EXPORT_SYMBOL(dss_mgr_register_framedone_handler);
+
+void dss_mgr_unregister_framedone_handler(struct omap_overlay_manager *mgr,
+                void (*handler)(void *), void *data)
+{
+        dss_mgr_ops->unregister_framedone_handler(mgr, handler, data);
 }
+EXPORT_SYMBOL(dss_mgr_unregister_framedone_handler);