Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 33ca237f authored by Tomi Valkeinen's avatar Tomi Valkeinen
Browse files

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: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent 2a4ee7ee

drivers/video/omap2/dss/dpi.c

+4 −1
Original line number Original line Diff line number Diff line
@@ -223,10 +223,13 @@ int omapdss_dpi_display_enable(struct omap_dss_device *dssdev) 




	mdelay(2);

	mdelay(2);





	dss_mgr_enable(dssdev->manager);

	r = dss_mgr_enable(dssdev->manager);

	if (r)

		goto err_mgr_enable;





	return 0;

	return 0;





err_mgr_enable:

err_set_mode:

err_set_mode:

	if (dpi_use_dsi_pll(dssdev))

	if (dpi_use_dsi_pll(dssdev))

		dsi_pll_uninit(dpi.dsidev, true);

		dsi_pll_uninit(dpi.dsidev, true);

drivers/video/omap2/dss/dsi.c

+10 −1
Original line number Original line Diff line number Diff line
@@ -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);

	int bpp = dsi_get_pixel_size(dssdev->panel.dsi_pix_fmt);

	u8 data_type;

	u8 data_type;

	u16 word_count;

	u16 word_count;

	int r;





	if (dssdev->panel.dsi_mode == OMAP_DSS_DSI_VIDEO_MODE) {

	if (dssdev->panel.dsi_mode == OMAP_DSS_DSI_VIDEO_MODE) {

		switch (dssdev->panel.dsi_pix_fmt) {

		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);

		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;

	return 0;

}

}

drivers/video/omap2/dss/hdmi.c

+8 −1
Original line number Original line Diff line number Diff line
@@ -387,9 +387,16 @@ static int hdmi_power_on(struct omap_dss_device *dssdev) 




	hdmi.ip_data.ops->video_enable(&hdmi.ip_data, 1);

	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;

	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:

err:

	hdmi_runtime_put();

	hdmi_runtime_put();

	return -EIO;

	return -EIO;

drivers/video/omap2/dss/sdi.c

+5 −1
Original line number Original line Diff line number Diff line
@@ -123,10 +123,14 @@ int omapdss_sdi_display_enable(struct omap_dss_device *dssdev) 
		goto err_sdi_enable;

		goto err_sdi_enable;

	mdelay(2);

	mdelay(2);





	dss_mgr_enable(dssdev->manager);

	r = dss_mgr_enable(dssdev->manager);

	if (r)

		goto err_mgr_enable;





	return 0;

	return 0;





err_mgr_enable:

	dss_sdi_disable();

err_sdi_enable:

err_sdi_enable:

err_set_dispc_clock_div:

err_set_dispc_clock_div:

err_set_dss_clock_div:

err_set_dss_clock_div:

drivers/video/omap2/dss/venc.c

+23 −3
Original line number Original line Diff line number Diff line
@@ -417,9 +417,10 @@ static const struct venc_config *venc_timings_to_config( 
	BUG();

	BUG();

}

}





static void venc_power_on(struct omap_dss_device *dssdev)

static int venc_power_on(struct omap_dss_device *dssdev)

{

{

	u32 l;

	u32 l;

	int r;





	venc_reset();

	venc_reset();

	venc_write_config(venc_timings_to_config(&dssdev->panel.timings));

	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)

	if (dssdev->platform_enable)

		dssdev->platform_enable(dssdev);

		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)

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)

	if (r)

		goto err1;

		goto err1;





	venc_power_on(dssdev);

	r = venc_power_on(dssdev);

	if (r)

		goto err2;





	venc.wss_data = 0;

	venc.wss_data = 0;
@@ -512,6 +530,8 @@ static int venc_panel_enable(struct omap_dss_device *dssdev) 




	mutex_unlock(&venc.venc_lock);

	mutex_unlock(&venc.venc_lock);

	return 0;

	return 0;

err2:

	venc_runtime_put();

err1:

err1:

	omap_dss_stop_device(dssdev);

	omap_dss_stop_device(dssdev);

err0:

err0: