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

Commit 179df15f authored by Tomi Valkeinen's avatar Tomi Valkeinen
Browse files

drm/omap: remove use of omapdss_find_mgr_from_display() 



In order to remove uses of 'struct omap_overlay_manager' we need to get
rid of using omapdss_find_mgr_from_display() when initializing omapdrm.

Instead of using omapdss_find_mgr_from_display() and mgr->id to find the
dispc channel used for the given display, we can instead use
omapdss_find_output_from_display(), and get the output->dispc_channel
from there.

We can also remove omapdss_find_mgr_from_display() as it's no longer
used.

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

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

+0 −18
Original line number Diff line number Diff line
@@ -169,24 +169,6 @@ struct omap_dss_device *omapdss_find_output_from_display(struct omap_dss_device 
}

EXPORT_SYMBOL(omapdss_find_output_from_display);



struct omap_overlay_manager *omapdss_find_mgr_from_display(struct omap_dss_device *dssdev)

{

	struct omap_dss_device *out;

	struct omap_overlay_manager *mgr;



	out = omapdss_find_output_from_display(dssdev);



	if (out == NULL)

		return NULL;



	mgr = out->manager;



	omap_dss_put_device(out);



	return mgr;

}

EXPORT_SYMBOL(omapdss_find_mgr_from_display);



static const struct dss_mgr_ops *dss_mgr_ops;



int dss_install_mgr_ops(const struct dss_mgr_ops *mgr_ops)

drivers/gpu/drm/omapdrm/omap_drv.c

+5 −3
Original line number Diff line number Diff line
@@ -352,7 +352,7 @@ static int omap_modeset_init(struct drm_device *dev) 
		struct drm_connector *connector;

		struct drm_encoder *encoder;

		enum omap_channel channel;

		struct omap_overlay_manager *mgr;

		struct omap_dss_device *out;



		if (!omapdss_device_is_connected(dssdev))

			continue;
@@ -399,8 +399,10 @@ static int omap_modeset_init(struct drm_device *dev) 
		 * not considered.

		 */



		mgr = omapdss_find_mgr_from_display(dssdev);

		channel = mgr->id;

		out = omapdss_find_output_from_display(dssdev);

		channel = out->dispc_channel;

		omap_dss_put_device(out);



		/*

		 * if this channel hasn't already been taken by a previously

		 * allocated crtc, we create a new crtc for it