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

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

drm/omap: convert dss_mgr_set_lcd_config to accept omap_channel 



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

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

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

+1 −1
Original line number Diff line number Diff line
@@ -378,7 +378,7 @@ static void dpi_config_lcd_manager(struct dpi_data *dpi) 


	dpi->mgr_config.lcden_sig_polarity = 0;



	dss_mgr_set_lcd_config(mgr, &dpi->mgr_config);

	dss_mgr_set_lcd_config(mgr->id, &dpi->mgr_config);

}



static int dpi_display_enable(struct omap_dss_device *dssdev)

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

+1 −1
Original line number Diff line number Diff line
@@ -4151,7 +4151,7 @@ static int dsi_display_init_dispc(struct platform_device *dsidev, 
			dsi_get_pixel_size(dsi->pix_fmt);

	dsi->mgr_config.lcden_sig_polarity = 0;



	dss_mgr_set_lcd_config(mgr, &dsi->mgr_config);

	dss_mgr_set_lcd_config(mgr->id, &dsi->mgr_config);



	return 0;

err1:

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

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ void dss_mgr_disconnect(enum omap_channel channel, 
		struct omap_dss_device *dst);

void dss_mgr_set_timings(enum omap_channel channel,

		const struct omap_video_timings *timings);

void dss_mgr_set_lcd_config(struct omap_overlay_manager *mgr,

void dss_mgr_set_lcd_config(enum omap_channel channel,

		const struct dss_lcd_mgr_config *config);

int dss_mgr_enable(struct omap_overlay_manager *mgr);

void dss_mgr_disable(struct omap_overlay_manager *mgr);

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

+2 −2
Original line number Diff line number Diff line
@@ -209,10 +209,10 @@ void dss_mgr_set_timings(enum omap_channel channel, 
}

EXPORT_SYMBOL(dss_mgr_set_timings);



void dss_mgr_set_lcd_config(struct omap_overlay_manager *mgr,

void dss_mgr_set_lcd_config(enum omap_channel channel,

		const struct dss_lcd_mgr_config *config)

{

	dss_mgr_ops->set_lcd_config(mgr->id, config);

	dss_mgr_ops->set_lcd_config(channel, config);

}

EXPORT_SYMBOL(dss_mgr_set_lcd_config);

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

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ static void sdi_config_lcd_manager(struct omap_dss_device *dssdev) 
	sdi.mgr_config.video_port_width = 24;

	sdi.mgr_config.lcden_sig_polarity = 1;



	dss_mgr_set_lcd_config(mgr, &sdi.mgr_config);

	dss_mgr_set_lcd_config(mgr->id, &sdi.mgr_config);

}



static int sdi_display_enable(struct omap_dss_device *dssdev)