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

Commit dee8260d authored by Laurent Pinchart's avatar Laurent Pinchart
Browse files

drm: omapdrm: Move crtc info out of the crtc structure 



The crtc info structure is only used to setup the crtc through the DSS
API. Move it from the crtc structure to local variables in
omap_crtc_dss_enable().

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent fb730c9b

drivers/gpu/drm/omapdrm/omap_crtc.c

+8 −10
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ struct omap_crtc { 


	const char *name;

	enum omap_channel channel;

	struct omap_overlay_manager_info info;

	struct drm_encoder *current_encoder;



	/*
@@ -188,8 +187,15 @@ static void omap_crtc_set_enabled(struct drm_crtc *crtc, bool enable) 
static int omap_crtc_dss_enable(struct omap_overlay_manager *mgr)

{

	struct omap_crtc *omap_crtc = omap_crtcs[mgr->id];

	struct omap_overlay_manager_info info;



	dispc_mgr_setup(omap_crtc->channel, &omap_crtc->info);

	memset(&info, 0, sizeof(info));

	info.default_color = 0x00000000;

	info.trans_key = 0x00000000;

	info.trans_key_type = OMAP_DSS_COLOR_KEY_GFX_DST;

	info.trans_enabled = false;



	dispc_mgr_setup(omap_crtc->channel, &info);

	dispc_mgr_set_timings(omap_crtc->channel,

			&omap_crtc->timings);

	omap_crtc_set_enabled(&omap_crtc->base, true);
@@ -628,7 +634,6 @@ struct drm_crtc *omap_crtc_init(struct drm_device *dev, 
{

	struct drm_crtc *crtc = NULL;

	struct omap_crtc *omap_crtc;

	struct omap_overlay_manager_info *info;

	int ret;



	DBG("%s", channel_names[channel]);
@@ -656,13 +661,6 @@ struct drm_crtc *omap_crtc_init(struct drm_device *dev, 
	/* temporary: */

	omap_crtc->mgr = omap_dss_get_overlay_manager(channel);



	/* TODO: fix hard-coded setup.. add properties! */

	info = &omap_crtc->info;

	info->default_color = 0x00000000;

	info->trans_key = 0x00000000;

	info->trans_key_type = OMAP_DSS_COLOR_KEY_GFX_DST;

	info->trans_enabled = false;



	ret = drm_crtc_init_with_planes(dev, crtc, plane, NULL,

					&omap_crtc_funcs);

	if (ret < 0) {