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

Commit bdac3bb9 authored by Tomi Valkeinen's avatar Tomi Valkeinen
Browse files

drm/omap: convert dss_mgr_disconnect to accept omap_channel 



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

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

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

+2 −2
Original line number Diff line number Diff line
@@ -684,7 +684,7 @@ static int dpi_connect(struct omap_dss_device *dssdev, 
	if (r) {

		DSSERR("failed to connect output to new device: %s\n",

				dst->name);

		dss_mgr_disconnect(mgr, dssdev);

		dss_mgr_disconnect(mgr->id, dssdev);

		return r;

	}
@@ -702,7 +702,7 @@ static void dpi_disconnect(struct omap_dss_device *dssdev, 
	omapdss_output_unset_device(dssdev);



	if (dssdev->manager)

		dss_mgr_disconnect(dssdev->manager, dssdev);

		dss_mgr_disconnect(dssdev->manager->id, dssdev);

}



static const struct omapdss_dpi_ops dpi_ops = {

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

+2 −2
Original line number Diff line number Diff line
@@ -5002,7 +5002,7 @@ static int dsi_connect(struct omap_dss_device *dssdev, 
	if (r) {

		DSSERR("failed to connect output to new device: %s\n",

				dssdev->name);

		dss_mgr_disconnect(mgr, dssdev);

		dss_mgr_disconnect(mgr->id, dssdev);

		return r;

	}
@@ -5020,7 +5020,7 @@ static void dsi_disconnect(struct omap_dss_device *dssdev, 
	omapdss_output_unset_device(dssdev);



	if (dssdev->manager)

		dss_mgr_disconnect(dssdev->manager, dssdev);

		dss_mgr_disconnect(dssdev->manager->id, dssdev);

}



static const struct omapdss_dsi_ops dsi_ops = {

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

+2 −2
Original line number Diff line number Diff line
@@ -457,7 +457,7 @@ static int hdmi_connect(struct omap_dss_device *dssdev, 
	if (r) {

		DSSERR("failed to connect output to new device: %s\n",

				dst->name);

		dss_mgr_disconnect(mgr, dssdev);

		dss_mgr_disconnect(mgr->id, dssdev);

		return r;

	}
@@ -475,7 +475,7 @@ static void hdmi_disconnect(struct omap_dss_device *dssdev, 
	omapdss_output_unset_device(dssdev);



	if (dssdev->manager)

		dss_mgr_disconnect(dssdev->manager, dssdev);

		dss_mgr_disconnect(dssdev->manager->id, dssdev);

}



static int hdmi_read_edid(struct omap_dss_device *dssdev,

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

+2 −2
Original line number Diff line number Diff line
@@ -483,7 +483,7 @@ static int hdmi_connect(struct omap_dss_device *dssdev, 
	if (r) {

		DSSERR("failed to connect output to new device: %s\n",

				dst->name);

		dss_mgr_disconnect(mgr, dssdev);

		dss_mgr_disconnect(mgr->id, dssdev);

		return r;

	}
@@ -501,7 +501,7 @@ static void hdmi_disconnect(struct omap_dss_device *dssdev, 
	omapdss_output_unset_device(dssdev);



	if (dssdev->manager)

		dss_mgr_disconnect(dssdev->manager, dssdev);

		dss_mgr_disconnect(dssdev->manager->id, dssdev);

}



static int hdmi_read_edid(struct omap_dss_device *dssdev,

drivers/gpu/drm/omapdrm/dss/omapdss.h

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ void dss_uninstall_mgr_ops(void); 


int dss_mgr_connect(enum omap_channel channel,

		struct omap_dss_device *dst);

void dss_mgr_disconnect(struct omap_overlay_manager *mgr,

void dss_mgr_disconnect(enum omap_channel channel,

		struct omap_dss_device *dst);

void dss_mgr_set_timings(struct omap_overlay_manager *mgr,

		const struct omap_video_timings *timings);