OMAPDSS: add omapdss_compat_init()

Add two new exported functions, omapdss_compat_init and
omapdss_compat_uninit, which are to be used by omapfb, omap_vout to
enable compatibility mode for omapdss. The functions are called by
omapdss internally for now, and moved to other drivers later.

The compatibility mode is implemented fully in the following patches.
For now, enabling compat mode only sets up the private data in apply.c.

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

diff --git a/drivers/video/omap2/dss/apply.c b/drivers/video/omap2/dss/apply.c
index 4a5cc5c64d4b1814c169f0882c5116a8d151ffd2..ba1343274bb74d3c49861eaadd10f8367a7ccbc0 100644 (file)
--- a/drivers/video/omap2/dss/apply.c
+++ b/drivers/video/omap2/dss/apply.c
@@ -18,6 +18,7 @@
 #define DSS_SUBSYS_NAME "APPLY"
 
 #include <linux/kernel.h>
+#include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/spinlock.h>
 #include <linux/jiffies.h>
@@ -131,7 +132,7 @@ static struct mgr_priv_data *get_mgr_priv(struct omap_overlay_manager *mgr)
        return &dss_data.mgr_priv_data_array[mgr->id];
 }
 
-void dss_apply_init(void)
+static void apply_init_priv(void)
 {
        const int num_ovls = dss_feat_get_num_ovls();
        struct mgr_priv_data *mp;
@@ -1463,3 +1464,33 @@ err:
        return r;
 }
 
+static int compat_refcnt;
+static DEFINE_MUTEX(compat_init_lock);
+
+int omapdss_compat_init(void)
+{
+       mutex_lock(&compat_init_lock);
+
+       if (compat_refcnt++ > 0)
+               goto out;
+
+       apply_init_priv();
+
+out:
+       mutex_unlock(&compat_init_lock);
+
+       return 0;
+}
+EXPORT_SYMBOL(omapdss_compat_init);
+
+void omapdss_compat_uninit(void)
+{
+       mutex_lock(&compat_init_lock);
+
+       if (--compat_refcnt > 0)
+               goto out;
+
+out:
+       mutex_unlock(&compat_init_lock);
+}
+EXPORT_SYMBOL(omapdss_compat_uninit);

diff --git a/drivers/video/omap2/dss/core.c b/drivers/video/omap2/dss/core.c
index 5c5e59190586587971b923771e41ee5b6f469fc6..86c743f5ed2e0dfda4669f0d6b01383d85e6f215 100644 (file)
--- a/drivers/video/omap2/dss/core.c
+++ b/drivers/video/omap2/dss/core.c
@@ -232,7 +232,7 @@ static int __init omap_dss_probe(struct platform_device *pdev)
 
        dss_features_init(omapdss_get_version());
 
-       dss_apply_init();
+       omapdss_compat_init();
 
        dss_init_overlay_managers(pdev);
        dss_init_overlays(pdev);
@@ -264,6 +264,8 @@ static int omap_dss_remove(struct platform_device *pdev)
        dss_uninit_overlays(pdev);
        dss_uninit_overlay_managers(pdev);
 
+       omapdss_compat_uninit();
+
        return 0;
 }
 

diff --git a/drivers/video/omap2/dss/dss.h b/drivers/video/omap2/dss/dss.h
index bdf843135661dcd165fb970cdf6e13fe61547405..9da3d61b8a56b7d70df5b42338dbc33271f2a334 100644 (file)
--- a/drivers/video/omap2/dss/dss.h
+++ b/drivers/video/omap2/dss/dss.h
@@ -178,7 +178,6 @@ void dss_copy_device_pdata(struct omap_dss_device *dst,
                const struct omap_dss_device *src);
 
 /* apply */
-void dss_apply_init(void);
 int dss_mgr_wait_for_go(struct omap_overlay_manager *mgr);
 int dss_mgr_wait_for_go_ovl(struct omap_overlay *ovl);
 void dss_mgr_start_update(struct omap_overlay_manager *mgr);

diff --git a/include/video/omapdss.h b/include/video/omapdss.h
index b1248c2d36e1623931b1416d3bb2e60629dad87b..a9402362d8178857b483e171244c95003885171c 100644 (file)
--- a/include/video/omapdss.h
+++ b/include/video/omapdss.h
@@ -836,4 +836,7 @@ void omapdss_rfbi_set_data_lines(struct omap_dss_device *dssdev,
 void omapdss_rfbi_set_interface_timings(struct omap_dss_device *dssdev,
                struct rfbi_timings *timings);
 
+int omapdss_compat_init(void);
+void omapdss_compat_uninit(void);
+
 #endif