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

Commit 705fd454 authored by Tomi Valkeinen's avatar Tomi Valkeinen
Browse files

drm/omap: convert dss_mgr_disable to accept omap_channel 



We are removing uses of 'struct omap_overlay_manager'. This patch
changes dss_mgr_disable() to accept 'enum omap_channel' instead of
'struct omap_overlay_manager'.

Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent 85a8c622

drivers/gpu/drm/omapdrm/dss/dispc-compat.c

+2 −2
Original line number Diff line number Diff line
@@ -379,7 +379,7 @@ static void dispc_error_worker(struct work_struct *work) 
					"with video overlays disabled\n",

					mgr->name);



			dss_mgr_disable(mgr);

			dss_mgr_disable(mgr->id);



			for (j = 0; j < omap_dss_get_num_overlays(); ++j) {

				struct omap_overlay *ovl;
@@ -400,7 +400,7 @@ static void dispc_error_worker(struct work_struct *work) 
			struct omap_overlay_manager *mgr;



			mgr = omap_dss_get_overlay_manager(i);

			dss_mgr_disable(mgr);

			dss_mgr_disable(mgr->id);

		}

	}

drivers/gpu/drm/omapdrm/dss/dpi.c

+1 −1
Original line number Diff line number Diff line
@@ -461,7 +461,7 @@ static void dpi_display_disable(struct omap_dss_device *dssdev) 


	mutex_lock(&dpi->lock);



	dss_mgr_disable(mgr);

	dss_mgr_disable(mgr->id);



	if (dpi->pll) {

		dss_select_lcd_clk_source(mgr->id, OMAP_DSS_CLK_SRC_FCK);

drivers/gpu/drm/omapdrm/dss/dsi.c

+1 −1
Original line number Diff line number Diff line
@@ -3910,7 +3910,7 @@ static void dsi_disable_video_output(struct omap_dss_device *dssdev, int channel 
		dsi_if_enable(dsidev, true);

	}



	dss_mgr_disable(mgr);

	dss_mgr_disable(mgr->id);



	dsi_display_uninit_dispc(dsidev, mgr);

}

drivers/gpu/drm/omapdrm/dss/hdmi4.c

+2 −2
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@ static int hdmi_power_on_full(struct omap_dss_device *dssdev) 
	return 0;



err_vid_enable:

	dss_mgr_disable(mgr);

	dss_mgr_disable(mgr->id);

err_mgr_enable:

	hdmi_wp_set_phy_pwr(&hdmi.wp, HDMI_PHYPWRCMD_OFF);

err_phy_pwr:
@@ -253,7 +253,7 @@ static void hdmi_power_off_full(struct omap_dss_device *dssdev) 


	hdmi_wp_video_stop(&hdmi.wp);



	dss_mgr_disable(mgr);

	dss_mgr_disable(mgr->id);



	hdmi_wp_set_phy_pwr(&hdmi.wp, HDMI_PHYPWRCMD_OFF);

drivers/gpu/drm/omapdrm/dss/hdmi5.c

+2 −2
Original line number Diff line number Diff line
@@ -250,7 +250,7 @@ static int hdmi_power_on_full(struct omap_dss_device *dssdev) 
	return 0;



err_vid_enable:

	dss_mgr_disable(mgr);

	dss_mgr_disable(mgr->id);

err_mgr_enable:

	hdmi_wp_set_phy_pwr(&hdmi.wp, HDMI_PHYPWRCMD_OFF);

err_phy_pwr:
@@ -270,7 +270,7 @@ static void hdmi_power_off_full(struct omap_dss_device *dssdev) 


	hdmi_wp_video_stop(&hdmi.wp);



	dss_mgr_disable(mgr);

	dss_mgr_disable(mgr->id);



	hdmi_wp_set_phy_pwr(&hdmi.wp, HDMI_PHYPWRCMD_OFF);