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

Commit 7b9cb5ee authored by Tomi Valkeinen's avatar Tomi Valkeinen
Browse files

drm/omap: Add dispc_mgr_get_supported_outputs() 



We are removing the use of the 'struct omap_overlay_manager' from
omapdrm, and one part of that is removing the use of
mgr->supported_outputs field.

This patch adds dispc_mgr_get_supported_outputs() function which can be
used instead of mgr->supported_outputs. omap_crtc.c is changed to use
the new function.

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

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

+6 −0
Original line number Diff line number Diff line
@@ -2910,6 +2910,12 @@ bool dispc_ovl_enabled(enum omap_plane plane) 
}

EXPORT_SYMBOL(dispc_ovl_enabled);



enum omap_dss_output_id dispc_mgr_get_supported_outputs(enum omap_channel channel)

{

	return dss_feat_get_supported_outputs(channel);

}

EXPORT_SYMBOL(dispc_mgr_get_supported_outputs);



void dispc_mgr_enable(enum omap_channel channel, bool enable)

{

	mgr_fld_write(channel, DISPC_MGR_FLD_ENABLE, enable);

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

+2 −0
Original line number Diff line number Diff line
@@ -58,6 +58,8 @@ int dispc_ovl_setup(enum omap_plane plane, const struct omap_overlay_info *oi, 
		bool replication, const struct omap_video_timings *mgr_timings,

		bool mem_to_mem);



enum omap_dss_output_id dispc_mgr_get_supported_outputs(enum omap_channel channel);



struct dss_mgr_ops {

	int (*connect)(struct omap_overlay_manager *mgr,

		struct omap_dss_device *dst);

drivers/gpu/drm/omapdrm/omap_crtc.c

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ static int omap_crtc_dss_connect(struct omap_overlay_manager *mgr, 
	if (mgr->output)

		return -EINVAL;



	if ((mgr->supported_outputs & dst->id) == 0)

	if ((dispc_mgr_get_supported_outputs(mgr->id) & dst->id) == 0)

		return -EINVAL;



	dst->manager = mgr;