openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Tomi Valkeinen <tomi.valkeinen@ti.com>
This commit is contained in:
Tomi Valkeinen 2015-11-04 20:25:05 +02:00
parent bdac3bb946
commit 5c6ff3cd45
8 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/omapdrm/dss/dpi.c
View File

@ -359,7 +359,7 @@ static int dpi_set_mode(struct dpi_data *dpi)
t->pixelclock = pck; t->pixelclock = pck;
} }
dss_mgr_set_timings(mgr, t); dss_mgr_set_timings(mgr->id, t);
return 0; return 0;
} }

4
drivers/gpu/drm/omapdrm/dss/dsi.c
View File

@ -3980,7 +3980,7 @@ static void dsi_update_screen_dispc(struct platform_device *dsidev)
msecs_to_jiffies(250)); msecs_to_jiffies(250));
BUG_ON(r == 0); BUG_ON(r == 0);
dss_mgr_set_timings(mgr, &dsi->timings); dss_mgr_set_timings(mgr->id, &dsi->timings);
dss_mgr_start_update(mgr); 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.de_level = OMAPDSS_SIG_ACTIVE_HIGH;
dsi->timings.sync_pclk_edge = OMAPDSS_DRIVE_SIG_FALLING_EDGE; 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); r = dsi_configure_dispc_clocks(dsidev);
if (r) if (r)

2
drivers/gpu/drm/omapdrm/dss/hdmi4.c
View File

@ -217,7 +217,7 @@ static int hdmi_power_on_full(struct omap_dss_device *dssdev)
dispc_enable_gamma_table(0); dispc_enable_gamma_table(0);
/* tv size */ /* tv size */
dss_mgr_set_timings(mgr, p); dss_mgr_set_timings(mgr->id, p);
r = dss_mgr_enable(mgr); r = dss_mgr_enable(mgr);
if (r) if (r)

2
drivers/gpu/drm/omapdrm/dss/hdmi5.c
View File

@ -234,7 +234,7 @@ static int hdmi_power_on_full(struct omap_dss_device *dssdev)
dispc_enable_gamma_table(0); dispc_enable_gamma_table(0);
/* tv size */ /* tv size */
dss_mgr_set_timings(mgr, p); dss_mgr_set_timings(mgr->id, p);
r = dss_mgr_enable(mgr); r = dss_mgr_enable(mgr);
if (r) if (r)

2
drivers/gpu/drm/omapdrm/dss/omapdss.h
View File

@ -86,7 +86,7 @@ int dss_mgr_connect(enum omap_channel channel,
struct omap_dss_device *dst); struct omap_dss_device *dst);
void dss_mgr_disconnect(enum omap_channel channel, void dss_mgr_disconnect(enum omap_channel channel,
struct omap_dss_device *dst); 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); const struct omap_video_timings *timings);
void dss_mgr_set_lcd_config(struct omap_overlay_manager *mgr, void dss_mgr_set_lcd_config(struct omap_overlay_manager *mgr,
const struct dss_lcd_mgr_config *config); const struct dss_lcd_mgr_config *config);

4
drivers/gpu/drm/omapdrm/dss/output.c
View File

@ -202,10 +202,10 @@ void dss_mgr_disconnect(enum omap_channel channel,
} }
EXPORT_SYMBOL(dss_mgr_disconnect); EXPORT_SYMBOL(dss_mgr_disconnect);
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) const struct omap_video_timings *timings)
{ {
dss_mgr_ops->set_timings(mgr->id, timings); dss_mgr_ops->set_timings(channel, timings);
} }
EXPORT_SYMBOL(dss_mgr_set_timings); EXPORT_SYMBOL(dss_mgr_set_timings);

2
drivers/gpu/drm/omapdrm/dss/sdi.c
View File

@ -169,7 +169,7 @@ static int sdi_display_enable(struct omap_dss_device *dssdev)
} }
dss_mgr_set_timings(out->manager, t); dss_mgr_set_timings(out->manager->id, t);
r = dss_set_fck_rate(fck); r = dss_set_fck_rate(fck);
if (r) if (r)

2
drivers/gpu/drm/omapdrm/dss/venc.c
View File

@ -469,7 +469,7 @@ static int venc_power_on(struct omap_dss_device *dssdev)
venc_write_reg(VENC_OUTPUT_CONTROL, l); venc_write_reg(VENC_OUTPUT_CONTROL, l);
dss_mgr_set_timings(mgr, &venc.timings); dss_mgr_set_timings(mgr->id, &venc.timings);
r = regulator_enable(venc.vdda_dac_reg); r = regulator_enable(venc.vdda_dac_reg);
if (r) if (r)