OMAPDSS: APPLY: move mgr funcs to apply.c

apply.c will handle the management of dispc in the future patches. This
patch moves overlay manager related functions to apply.c so that they
will have access to the private data and functions of 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 e42d1d3baae25f0efebaa1246958e0ceaa315342..1aab0a340ee904d01c17a85017c2b96702c5a221 100644 (file)
--- a/drivers/video/omap2/dss/apply.c
+++ b/drivers/video/omap2/dss/apply.c
@@ -662,6 +662,89 @@ void dss_mgr_disable(struct omap_overlay_manager *mgr)
        mgr->enabled = false;
 }
 
+int dss_mgr_set_info(struct omap_overlay_manager *mgr,
+               struct omap_overlay_manager_info *info)
+{
+       int r;
+       struct omap_overlay_manager_info old_info;
+
+       old_info = mgr->info;
+       mgr->info = *info;
+
+       r = dss_check_manager(mgr);
+       if (r) {
+               mgr->info = old_info;
+               return r;
+       }
+
+       mgr->info_dirty = true;
+
+       return 0;
+}
+
+void dss_mgr_get_info(struct omap_overlay_manager *mgr,
+               struct omap_overlay_manager_info *info)
+{
+       *info = mgr->info;
+}
+
+int dss_mgr_set_device(struct omap_overlay_manager *mgr,
+               struct omap_dss_device *dssdev)
+{
+       int r;
+       struct omap_overlay *ovl;
+
+       if (dssdev->manager) {
+               DSSERR("display '%s' already has a manager '%s'\n",
+                              dssdev->name, dssdev->manager->name);
+               return -EINVAL;
+       }
+
+       if ((mgr->supported_displays & dssdev->type) == 0) {
+               DSSERR("display '%s' does not support manager '%s'\n",
+                              dssdev->name, mgr->name);
+               return -EINVAL;
+       }
+
+       list_for_each_entry(ovl, &mgr->overlays, list) {
+               if (!ovl->info.enabled)
+                       continue;
+
+               r = dss_check_overlay(ovl, dssdev);
+               if (r)
+                       return r;
+       }
+
+       dssdev->manager = mgr;
+       mgr->device = dssdev;
+       mgr->device_changed = true;
+
+       return 0;
+}
+
+int dss_mgr_unset_device(struct omap_overlay_manager *mgr)
+{
+       if (!mgr->device) {
+               DSSERR("failed to unset display, display not set.\n");
+               return -EINVAL;
+       }
+
+       /*
+        * Don't allow currently enabled displays to have the overlay manager
+        * pulled out from underneath them
+        */
+       if (mgr->device->state != OMAP_DSS_DISPLAY_DISABLED)
+               return -EINVAL;
+
+       mgr->device->manager = NULL;
+       mgr->device = NULL;
+       mgr->device_changed = true;
+
+       return 0;
+}
+
+
+
 int dss_ovl_set_info(struct omap_overlay *ovl,
                struct omap_overlay_info *info)
 {

diff --git a/drivers/video/omap2/dss/dss.h b/drivers/video/omap2/dss/dss.h
index 163b9d9b7a44f30c83099579786a0669c765e43d..41f69a10d3591bfd391d435c5d52268f564c1aa9 100644 (file)
--- a/drivers/video/omap2/dss/dss.h
+++ b/drivers/video/omap2/dss/dss.h
@@ -169,8 +169,16 @@ 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);
 int omap_dss_mgr_apply(struct omap_overlay_manager *mgr);
+
 void dss_mgr_enable(struct omap_overlay_manager *mgr);
 void dss_mgr_disable(struct omap_overlay_manager *mgr);
+int dss_mgr_set_info(struct omap_overlay_manager *mgr,
+               struct omap_overlay_manager_info *info);
+void dss_mgr_get_info(struct omap_overlay_manager *mgr,
+               struct omap_overlay_manager_info *info);
+int dss_mgr_set_device(struct omap_overlay_manager *mgr,
+               struct omap_dss_device *dssdev);
+int dss_mgr_unset_device(struct omap_overlay_manager *mgr);
 
 int dss_ovl_set_info(struct omap_overlay *ovl,
                struct omap_overlay_info *info);
@@ -198,6 +206,7 @@ void default_get_overlay_fifo_thresholds(enum omap_plane plane,
 /* manager */
 int dss_init_overlay_managers(struct platform_device *pdev);
 void dss_uninit_overlay_managers(struct platform_device *pdev);
+int dss_check_manager(struct omap_overlay_manager *mgr);
 
 /* overlay */
 void dss_init_overlays(struct platform_device *pdev);

diff --git a/drivers/video/omap2/dss/manager.c b/drivers/video/omap2/dss/manager.c
index 62bcc384e7aec39e06389b2d4ccf0936224a4e7c..ab0b61b716f145204153caf834b8b0ee83653e1d 100644 (file)
--- a/drivers/video/omap2/dss/manager.c
+++ b/drivers/video/omap2/dss/manager.c
@@ -467,61 +467,6 @@ static struct kobj_type manager_ktype = {
        .default_attrs = manager_sysfs_attrs,
 };
 
-static int omap_dss_set_device(struct omap_overlay_manager *mgr,
-               struct omap_dss_device *dssdev)
-{
-       int r;
-       struct omap_overlay *ovl;
-
-       if (dssdev->manager) {
-               DSSERR("display '%s' already has a manager '%s'\n",
-                              dssdev->name, dssdev->manager->name);
-               return -EINVAL;
-       }
-
-       if ((mgr->supported_displays & dssdev->type) == 0) {
-               DSSERR("display '%s' does not support manager '%s'\n",
-                              dssdev->name, mgr->name);
-               return -EINVAL;
-       }
-
-       list_for_each_entry(ovl, &mgr->overlays, list) {
-               if (!ovl->info.enabled)
-                       continue;
-
-               r = dss_check_overlay(ovl, dssdev);
-               if (r)
-                       return r;
-       }
-
-       dssdev->manager = mgr;
-       mgr->device = dssdev;
-       mgr->device_changed = true;
-
-       return 0;
-}
-
-static int omap_dss_unset_device(struct omap_overlay_manager *mgr)
-{
-       if (!mgr->device) {
-               DSSERR("failed to unset display, display not set.\n");
-               return -EINVAL;
-       }
-
-       /*
-        * Don't allow currently enabled displays to have the overlay manager
-        * pulled out from underneath them
-        */
-       if (mgr->device->state != OMAP_DSS_DISPLAY_DISABLED)
-               return -EINVAL;
-
-       mgr->device->manager = NULL;
-       mgr->device = NULL;
-       mgr->device_changed = true;
-
-       return 0;
-}
-
 static int dss_mgr_wait_for_vsync(struct omap_overlay_manager *mgr)
 {
        unsigned long timeout = msecs_to_jiffies(500);
@@ -540,7 +485,7 @@ static int dss_mgr_wait_for_vsync(struct omap_overlay_manager *mgr)
        return omap_dispc_wait_for_irq_interruptible_timeout(irq, timeout);
 }
 
-static int dss_check_manager(struct omap_overlay_manager *mgr)
+int dss_check_manager(struct omap_overlay_manager *mgr)
 {
        if (dss_has_feature(FEAT_ALPHA_FIXED_ZORDER)) {
                /*
@@ -557,32 +502,6 @@ static int dss_check_manager(struct omap_overlay_manager *mgr)
        return 0;
 }
 
-static int omap_dss_mgr_set_info(struct omap_overlay_manager *mgr,
-               struct omap_overlay_manager_info *info)
-{
-       int r;
-       struct omap_overlay_manager_info old_info;
-
-       old_info = mgr->info;
-       mgr->info = *info;
-
-       r = dss_check_manager(mgr);
-       if (r) {
-               mgr->info = old_info;
-               return r;
-       }
-
-       mgr->info_dirty = true;
-
-       return 0;
-}
-
-static void omap_dss_mgr_get_info(struct omap_overlay_manager *mgr,
-               struct omap_overlay_manager_info *info)
-{
-       *info = mgr->info;
-}
-
 int dss_init_overlay_managers(struct platform_device *pdev)
 {
        int i, r;
@@ -612,11 +531,11 @@ int dss_init_overlay_managers(struct platform_device *pdev)
                        break;
                }
 
-               mgr->set_device = &omap_dss_set_device;
-               mgr->unset_device = &omap_dss_unset_device;
+               mgr->set_device = &dss_mgr_set_device;
+               mgr->unset_device = &dss_mgr_unset_device;
                mgr->apply = &omap_dss_mgr_apply;
-               mgr->set_manager_info = &omap_dss_mgr_set_info;
-               mgr->get_manager_info = &omap_dss_mgr_get_info;
+               mgr->set_manager_info = &dss_mgr_set_info;
+               mgr->get_manager_info = &dss_mgr_get_info;
                mgr->wait_for_go = &dss_mgr_wait_for_go;
                mgr->wait_for_vsync = &dss_mgr_wait_for_vsync;