OMAPDSS: HDMI: Replace dssdev->manager with dssdev->output->manager references

With addition of output entities, a device connects to an output, and an output
connects to overlay manager. Replace the dssdev->manager references with
dssdev->output->manager to access the manager correctly.

When enabling the HDMI output, check whether the output entity connected to
display is not NULL.

Signed-off-by: Archit Taneja <archit@ti.com>

1 files changed, 10 insertions, 6 deletions

diff --git a/drivers/video/omap2/dss/hdmi.c b/drivers/video/omap2/dss/hdmi.c
index 294bf9879434..a48a7dd75b33 100644
--- a/drivers/video/omap2/dss/hdmi.c
+++ b/drivers/video/omap2/dss/hdmi.c
@@ -504,6 +504,7 @@ static int hdmi_power_on(struct omap_dss_device *dssdev)
 {
         int r;
         struct omap_video_timings *p;
+        struct omap_overlay_manager *mgr = dssdev->output->manager;
         unsigned long phy;
 
         gpio_set_value(hdmi.ct_cp_hpd_gpio, 1);
@@ -520,7 +521,7 @@ static int hdmi_power_on(struct omap_dss_device *dssdev)
         if (r)
                 goto err_runtime_get;
 
-        dss_mgr_disable(dssdev->manager);
+        dss_mgr_disable(mgr);
 
         p = &hdmi.ip_data.cfg.timings;
 
@@ -562,13 +563,13 @@ static int hdmi_power_on(struct omap_dss_device *dssdev)
         dispc_enable_gamma_table(0);
 
         /* tv size */
-        dss_mgr_set_timings(dssdev->manager, p);
+        dss_mgr_set_timings(mgr, p);
 
         r = hdmi.ip_data.ops->video_enable(&hdmi.ip_data);
         if (r)
                 goto err_vid_enable;
 
-        r = dss_mgr_enable(dssdev->manager);
+        r = dss_mgr_enable(mgr);
         if (r)
                 goto err_mgr_enable;
 
@@ -592,7 +593,9 @@ err_vdac_enable:
 
 static void hdmi_power_off(struct omap_dss_device *dssdev)
 {
-        dss_mgr_disable(dssdev->manager);
+        struct omap_overlay_manager *mgr = dssdev->output->manager;
+
+        dss_mgr_disable(mgr);
 
         hdmi.ip_data.ops->video_disable(&hdmi.ip_data);
         hdmi.ip_data.ops->phy_disable(&hdmi.ip_data);
@@ -689,14 +692,15 @@ bool omapdss_hdmi_detect(void)
 
 int omapdss_hdmi_display_enable(struct omap_dss_device *dssdev)
 {
+        struct omap_dss_output *out = dssdev->output;
         int r = 0;
 
         DSSDBG("ENTER hdmi_display_enable\n");
 
         mutex_lock(&hdmi.lock);
 
-        if (dssdev->manager == NULL) {
-                DSSERR("failed to enable display: no manager\n");
+        if (out == NULL || out->manager == NULL) {
+                DSSERR("failed to enable display: no output/manager\n");
                 r = -ENODEV;
                 goto err0;
         }