With the introduction of output entities, managers will now connect to outputs.
Create a helper op for managers named get_device. This will abstract away the
information on how to get the device from an overlay manager. The get_device
op currently retrieves the output via a manager->device reference. This will
be later replaced by a manager->output->device reference.

Signed-off-by: Archit Taneja <arc...@ti.com>
---
 drivers/video/omap2/dss/apply.c   |    6 ++++--
 drivers/video/omap2/dss/dispc.c   |   10 +++++++---
 drivers/video/omap2/dss/manager.c |   19 ++++++++++++++-----
 include/video/omapdss.h           |    2 ++
 4 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/drivers/video/omap2/dss/apply.c b/drivers/video/omap2/dss/apply.c
index d241407..8a05cbc 100644
--- a/drivers/video/omap2/dss/apply.c
+++ b/drivers/video/omap2/dss/apply.c
@@ -1607,7 +1607,8 @@ int dss_ovl_enable(struct omap_overlay *ovl)
                goto err1;
        }
 
-       if (ovl->manager == NULL || ovl->manager->device == NULL) {
+       if (ovl->manager == NULL ||
+                       ovl->manager->get_device(ovl->manager) == NULL) {
                r = -EINVAL;
                goto err1;
        }
@@ -1676,7 +1677,8 @@ int dss_ovl_disable(struct omap_overlay *ovl)
                goto err;
        }
 
-       if (ovl->manager == NULL || ovl->manager->device == NULL) {
+       if (ovl->manager == NULL ||
+                       ovl->manager->get_device(ovl->manager) == NULL) {
                r = -EINVAL;
                goto err;
        }
diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c
index ff52702..33061f5 100644
--- a/drivers/video/omap2/dss/dispc.c
+++ b/drivers/video/omap2/dss/dispc.c
@@ -3503,7 +3503,7 @@ static void dispc_error_worker(struct work_struct *work)
                bit = mgr_desc[i].sync_lost_irq;
 
                if (bit & errors) {
-                       struct omap_dss_device *dssdev = mgr->device;
+                       struct omap_dss_device *dssdev = mgr->get_device(mgr);
                        bool enable;
 
                        DSSERR("SYNC_LOST on channel %s, restarting the output "
@@ -3534,9 +3534,13 @@ static void dispc_error_worker(struct work_struct *work)
                DSSERR("OCP_ERR\n");
                for (i = 0; i < omap_dss_get_num_overlay_managers(); ++i) {
                        struct omap_overlay_manager *mgr;
+                       struct omap_dss_device *dssdev;
+
                        mgr = omap_dss_get_overlay_manager(i);
-                       if (mgr->device && mgr->device->driver)
-                               mgr->device->driver->disable(mgr->device);
+                       dssdev = mgr->get_device(mgr);
+
+                       if (dssdev && dssdev->driver)
+                               dssdev->driver->disable(dssdev);
                }
        }
 
diff --git a/drivers/video/omap2/dss/manager.c 
b/drivers/video/omap2/dss/manager.c
index e15fa5f..fd39f66 100644
--- a/drivers/video/omap2/dss/manager.c
+++ b/drivers/video/omap2/dss/manager.c
@@ -43,8 +43,10 @@ static ssize_t manager_name_show(struct omap_overlay_manager 
*mgr, char *buf)
 
 static ssize_t manager_display_show(struct omap_overlay_manager *mgr, char 
*buf)
 {
-       return snprintf(buf, PAGE_SIZE, "%s\n",
-                       mgr->device ? mgr->device->name : "<none>");
+       struct omap_dss_device *dssdev = mgr->get_device(mgr);
+
+       return snprintf(buf, PAGE_SIZE, "%s\n", dssdev ?
+                       dssdev->name : "<none>");
 }
 
 static ssize_t manager_display_store(struct omap_overlay_manager *mgr,
@@ -72,7 +74,7 @@ static ssize_t manager_display_store(struct 
omap_overlay_manager *mgr,
        if (dssdev)
                DSSDBG("display %s found\n", dssdev->name);
 
-       if (mgr->device) {
+       if (mgr->get_device(mgr)) {
                r = mgr->unset_device(mgr);
                if (r) {
                        DSSERR("failed to unset display\n");
@@ -490,9 +492,15 @@ static struct kobj_type manager_ktype = {
        .default_attrs = manager_sysfs_attrs,
 };
 
+static inline struct omap_dss_device *dss_mgr_get_device(struct 
omap_overlay_manager *mgr)
+{
+       return mgr->device;
+}
+
 static int dss_mgr_wait_for_vsync(struct omap_overlay_manager *mgr)
 {
        unsigned long timeout = msecs_to_jiffies(500);
+       struct omap_dss_device *dssdev = mgr->get_device(mgr);
        u32 irq;
        int r;
 
@@ -500,9 +508,9 @@ static int dss_mgr_wait_for_vsync(struct 
omap_overlay_manager *mgr)
        if (r)
                return r;
 
-       if (mgr->device->type == OMAP_DISPLAY_TYPE_VENC)
+       if (dssdev->type == OMAP_DISPLAY_TYPE_VENC)
                irq = DISPC_IRQ_EVSYNC_ODD;
-       else if (mgr->device->type == OMAP_DISPLAY_TYPE_HDMI)
+       else if (dssdev->type == OMAP_DISPLAY_TYPE_HDMI)
                irq = DISPC_IRQ_EVSYNC_EVEN;
        else
                irq = dispc_mgr_get_vsync_irq(mgr->id);
@@ -556,6 +564,7 @@ int dss_init_overlay_managers(struct platform_device *pdev)
                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;
+               mgr->get_device = &dss_mgr_get_device;
 
                mgr->caps = 0;
                mgr->supported_displays =
diff --git a/include/video/omapdss.h b/include/video/omapdss.h
index 813672b..361d41e 100644
--- a/include/video/omapdss.h
+++ b/include/video/omapdss.h
@@ -490,6 +490,8 @@ struct omap_overlay_manager {
        int (*apply)(struct omap_overlay_manager *mgr);
        int (*wait_for_go)(struct omap_overlay_manager *mgr);
        int (*wait_for_vsync)(struct omap_overlay_manager *mgr);
+
+       struct omap_dss_device *(*get_device)(struct omap_overlay_manager *mgr);
 };
 
 /* 22 pins means 1 clk lane and 10 data lanes */
-- 
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to