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

Commit 5c6ff3cd authored by Tomi Valkeinen's avatar Tomi Valkeinen
Browse files

drm/omap: convert dss_mgr_set_timings to accept omap_channel 



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

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

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

+1 −1
Original line number Diff line number Diff line
@@ -359,7 +359,7 @@ static int dpi_set_mode(struct dpi_data *dpi) 
		t->pixelclock = pck;

	}



	dss_mgr_set_timings(mgr, t);

	dss_mgr_set_timings(mgr->id, t);



	return 0;

}

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

+2 −2
Original line number Diff line number Diff line
@@ -3980,7 +3980,7 @@ static void dsi_update_screen_dispc(struct platform_device *dsidev) 
		msecs_to_jiffies(250));

	BUG_ON(r == 0);



	dss_mgr_set_timings(mgr, &dsi->timings);

	dss_mgr_set_timings(mgr->id, &dsi->timings);



	dss_mgr_start_update(mgr);
@@ -4140,7 +4140,7 @@ static int dsi_display_init_dispc(struct platform_device *dsidev, 
	dsi->timings.de_level = OMAPDSS_SIG_ACTIVE_HIGH;

	dsi->timings.sync_pclk_edge = OMAPDSS_DRIVE_SIG_FALLING_EDGE;



	dss_mgr_set_timings(mgr, &dsi->timings);

	dss_mgr_set_timings(mgr->id, &dsi->timings);



	r = dsi_configure_dispc_clocks(dsidev);

	if (r)

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

+1 −1
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ static int hdmi_power_on_full(struct omap_dss_device *dssdev) 
	dispc_enable_gamma_table(0);



	/* tv size */

	dss_mgr_set_timings(mgr, p);

	dss_mgr_set_timings(mgr->id, p);



	r = dss_mgr_enable(mgr);

	if (r)

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

+1 −1
Original line number Diff line number Diff line
@@ -234,7 +234,7 @@ static int hdmi_power_on_full(struct omap_dss_device *dssdev) 
	dispc_enable_gamma_table(0);



	/* tv size */

	dss_mgr_set_timings(mgr, p);

	dss_mgr_set_timings(mgr->id, p);



	r = dss_mgr_enable(mgr);

	if (r)

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

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ int dss_mgr_connect(enum omap_channel channel, 
		struct omap_dss_device *dst);

void dss_mgr_disconnect(enum omap_channel channel,

		struct omap_dss_device *dst);

void dss_mgr_set_timings(struct omap_overlay_manager *mgr,

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,

		const struct dss_lcd_mgr_config *config);