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

Commit 85a8c622 authored by Tomi Valkeinen's avatar Tomi Valkeinen
Browse files

drm/omap: convert dss_mgr_enable to accept omap_channel 



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

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

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

+1 −1
Original line number Diff line number Diff line
@@ -390,7 +390,7 @@ static void dispc_error_worker(struct work_struct *work) 
					ovl->disable(ovl);

			}



			dss_mgr_enable(mgr);

			dss_mgr_enable(mgr->id);

		}

	}

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

+1 −1
Original line number Diff line number Diff line
@@ -429,7 +429,7 @@ static int dpi_display_enable(struct omap_dss_device *dssdev) 


	mdelay(2);



	r = dss_mgr_enable(out->manager);

	r = dss_mgr_enable(out->manager->id);

	if (r)

		goto err_mgr_enable;

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

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

	}



	r = dss_mgr_enable(mgr);

	r = dss_mgr_enable(mgr->id);

	if (r)

		goto err_mgr_enable;

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

+1 −1
Original line number Diff line number Diff line
@@ -219,7 +219,7 @@ static int hdmi_power_on_full(struct omap_dss_device *dssdev) 
	/* tv size */

	dss_mgr_set_timings(mgr->id, p);



	r = dss_mgr_enable(mgr);

	r = dss_mgr_enable(mgr->id);

	if (r)

		goto err_mgr_enable;

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

+1 −1
Original line number Diff line number Diff line
@@ -236,7 +236,7 @@ static int hdmi_power_on_full(struct omap_dss_device *dssdev) 
	/* tv size */

	dss_mgr_set_timings(mgr->id, p);



	r = dss_mgr_enable(mgr);

	r = dss_mgr_enable(mgr->id);

	if (r)

		goto err_mgr_enable;