OMAPDSS: check the return value of dss_mgr_enable()

Now that dss_mgr_enable returns an error value, check it in all the
places dss_mgr_enable is used, and bail out properly.

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

diff --git a/drivers/video/omap2/dss/dpi.c b/drivers/video/omap2/dss/dpi.c
index 79c4df3c9a881b319da36d8a7c1bc2a27af68bbb..395d658a94fcab1e7e54131e96485b379fee07a7 100644 (file)
--- a/drivers/video/omap2/dss/dpi.c
+++ b/drivers/video/omap2/dss/dpi.c
@@ -223,10 +223,13 @@ int omapdss_dpi_display_enable(struct omap_dss_device *dssdev)
 
        mdelay(2);
 
-       dss_mgr_enable(dssdev->manager);
+       r = dss_mgr_enable(dssdev->manager);
+       if (r)
+               goto err_mgr_enable;
 
        return 0;
 
+err_mgr_enable:
 err_set_mode:
        if (dpi_use_dsi_pll(dssdev))
                dsi_pll_uninit(dpi.dsidev, true);

diff --git a/drivers/video/omap2/dss/dsi.c b/drivers/video/omap2/dss/dsi.c
index 9cb2e827c001a5f11c3249cfe02365ce080620c8..4dc98b692267aa384d87c00c59d1bffefdb660c7 100644 (file)
--- a/drivers/video/omap2/dss/dsi.c
+++ b/drivers/video/omap2/dss/dsi.c
@@ -3979,6 +3979,7 @@ int dsi_enable_video_output(struct omap_dss_device *dssdev, int channel)
        int bpp = dsi_get_pixel_size(dssdev->panel.dsi_pix_fmt);
        u8 data_type;
        u16 word_count;
+       int r;
 
        if (dssdev->panel.dsi_mode == OMAP_DSS_DSI_VIDEO_MODE) {
                switch (dssdev->panel.dsi_pix_fmt) {
@@ -4013,7 +4014,15 @@ int dsi_enable_video_output(struct omap_dss_device *dssdev, int channel)
                dsi_if_enable(dsidev, true);
        }
 
-       dss_mgr_enable(dssdev->manager);
+       r = dss_mgr_enable(dssdev->manager);
+       if (r) {
+               if (dssdev->panel.dsi_mode == OMAP_DSS_DSI_VIDEO_MODE) {
+                       dsi_if_enable(dsidev, false);
+                       dsi_vc_enable(dsidev, channel, false);
+               }
+
+               return r;
+       }
 
        return 0;
 }

diff --git a/drivers/video/omap2/dss/hdmi.c b/drivers/video/omap2/dss/hdmi.c
index e245a2bbba9db147307f1e63767ac9b66bc52ee6..b064762b6994f595404dbd98f41d0dd68d7d1f4b 100644 (file)
--- a/drivers/video/omap2/dss/hdmi.c
+++ b/drivers/video/omap2/dss/hdmi.c
@@ -387,9 +387,16 @@ static int hdmi_power_on(struct omap_dss_device *dssdev)
 
        hdmi.ip_data.ops->video_enable(&hdmi.ip_data, 1);
 
-       dss_mgr_enable(dssdev->manager);
+       r = dss_mgr_enable(dssdev->manager);
+       if (r)
+               goto err_mgr_enable;
 
        return 0;
+
+err_mgr_enable:
+       hdmi.ip_data.ops->video_enable(&hdmi.ip_data, 0);
+       hdmi.ip_data.ops->phy_disable(&hdmi.ip_data);
+       hdmi.ip_data.ops->pll_disable(&hdmi.ip_data);
 err:
        hdmi_runtime_put();
        return -EIO;

diff --git a/drivers/video/omap2/dss/sdi.c b/drivers/video/omap2/dss/sdi.c
index 02da8beb730479d4de055dc9f3fe310d15e8f827..8266ca0d666bc2de7547a12c38eca9dc98aba11a 100644 (file)
--- a/drivers/video/omap2/dss/sdi.c
+++ b/drivers/video/omap2/dss/sdi.c
@@ -123,10 +123,14 @@ int omapdss_sdi_display_enable(struct omap_dss_device *dssdev)
                goto err_sdi_enable;
        mdelay(2);
 
-       dss_mgr_enable(dssdev->manager);
+       r = dss_mgr_enable(dssdev->manager);
+       if (r)
+               goto err_mgr_enable;
 
        return 0;
 
+err_mgr_enable:
+       dss_sdi_disable();
 err_sdi_enable:
 err_set_dispc_clock_div:
 err_set_dss_clock_div:

diff --git a/drivers/video/omap2/dss/venc.c b/drivers/video/omap2/dss/venc.c
index 101fcd77a50d8b7845c2c664688851aa9f57633c..b3e9f90915815f4e82950743c72b6d36acad8913 100644 (file)
--- a/drivers/video/omap2/dss/venc.c
+++ b/drivers/video/omap2/dss/venc.c
@@ -417,9 +417,10 @@ static const struct venc_config *venc_timings_to_config(
        BUG();
 }
 
-static void venc_power_on(struct omap_dss_device *dssdev)
+static int venc_power_on(struct omap_dss_device *dssdev)
 {
        u32 l;
+       int r;
 
        venc_reset();
        venc_write_config(venc_timings_to_config(&dssdev->panel.timings));
@@ -447,7 +448,22 @@ static void venc_power_on(struct omap_dss_device *dssdev)
        if (dssdev->platform_enable)
                dssdev->platform_enable(dssdev);
 
-       dss_mgr_enable(dssdev->manager);
+       r = dss_mgr_enable(dssdev->manager);
+       if (r)
+               goto err;
+
+       return 0;
+
+err:
+       venc_write_reg(VENC_OUTPUT_CONTROL, 0);
+       dss_set_dac_pwrdn_bgz(0);
+
+       if (dssdev->platform_disable)
+               dssdev->platform_disable(dssdev);
+
+       regulator_disable(venc.vdda_dac_reg);
+
+       return r;
 }
 
 static void venc_power_off(struct omap_dss_device *dssdev)
@@ -504,7 +520,9 @@ static int venc_panel_enable(struct omap_dss_device *dssdev)
        if (r)
                goto err1;
 
-       venc_power_on(dssdev);
+       r = venc_power_on(dssdev);
+       if (r)
+               goto err2;
 
        venc.wss_data = 0;
 
@@ -512,6 +530,8 @@ static int venc_panel_enable(struct omap_dss_device *dssdev)
 
        mutex_unlock(&venc.venc_lock);
        return 0;
+err2:
+       venc_runtime_put();
 err1:
        omap_dss_stop_device(dssdev);
 err0: