aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@ti.com>2015-11-05 02:20:46 -0500
committerTomi Valkeinen <tomi.valkeinen@ti.com>2016-03-03 10:38:23 -0500
commit1f03f93480c59bff7afcc61977aa4060d3d6fb20 (patch)
tree4a931a959a6881f514c6acb1aaacbe02208d5b13
parent705fd454a909ab652954c04352bc9f2753523d7b (diff)
drm/omap: convert dss_mgr_start_update to accept omap_channel
We are removing uses of 'struct omap_overlay_manager'. This patch changes dss_mgr_start_update() to accept 'enum omap_channel' instead of 'struct omap_overlay_manager'. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
-rw-r--r--drivers/gpu/drm/omapdrm/dss/dsi.c2
-rw-r--r--drivers/gpu/drm/omapdrm/dss/omapdss.h2
-rw-r--r--drivers/gpu/drm/omapdrm/dss/output.c4
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.c b/drivers/gpu/drm/omapdrm/dss/dsi.c
index 08751c9cc973..0ef01a6dd6be 100644
--- a/drivers/gpu/drm/omapdrm/dss/dsi.c
+++ b/drivers/gpu/drm/omapdrm/dss/dsi.c
@@ -3982,7 +3982,7 @@ static void dsi_update_screen_dispc(struct platform_device *dsidev)
3982 3982
3983 dss_mgr_set_timings(mgr->id, &dsi->timings); 3983 dss_mgr_set_timings(mgr->id, &dsi->timings);
3984 3984
3985 dss_mgr_start_update(mgr); 3985 dss_mgr_start_update(mgr->id);
3986 3986
3987 if (dsi->te_enabled) { 3987 if (dsi->te_enabled) {
3988 /* disable LP_RX_TO, so that we can receive TE. Time to wait 3988 /* disable LP_RX_TO, so that we can receive TE. Time to wait
diff --git a/drivers/gpu/drm/omapdrm/dss/omapdss.h b/drivers/gpu/drm/omapdrm/dss/omapdss.h
index 25c3449111b2..4d72909313e4 100644
--- a/drivers/gpu/drm/omapdrm/dss/omapdss.h
+++ b/drivers/gpu/drm/omapdrm/dss/omapdss.h
@@ -92,7 +92,7 @@ void dss_mgr_set_lcd_config(enum omap_channel channel,
92 const struct dss_lcd_mgr_config *config); 92 const struct dss_lcd_mgr_config *config);
93int dss_mgr_enable(enum omap_channel channel); 93int dss_mgr_enable(enum omap_channel channel);
94void dss_mgr_disable(enum omap_channel channel); 94void dss_mgr_disable(enum omap_channel channel);
95void dss_mgr_start_update(struct omap_overlay_manager *mgr); 95void dss_mgr_start_update(enum omap_channel channel);
96int dss_mgr_register_framedone_handler(struct omap_overlay_manager *mgr, 96int dss_mgr_register_framedone_handler(struct omap_overlay_manager *mgr,
97 void (*handler)(void *), void *data); 97 void (*handler)(void *), void *data);
98void dss_mgr_unregister_framedone_handler(struct omap_overlay_manager *mgr, 98void dss_mgr_unregister_framedone_handler(struct omap_overlay_manager *mgr,
diff --git a/drivers/gpu/drm/omapdrm/dss/output.c b/drivers/gpu/drm/omapdrm/dss/output.c
index c6238746efe1..39a0d7f59a80 100644
--- a/drivers/gpu/drm/omapdrm/dss/output.c
+++ b/drivers/gpu/drm/omapdrm/dss/output.c
@@ -228,9 +228,9 @@ void dss_mgr_disable(enum omap_channel channel)
228} 228}
229EXPORT_SYMBOL(dss_mgr_disable); 229EXPORT_SYMBOL(dss_mgr_disable);
230 230
231void dss_mgr_start_update(struct omap_overlay_manager *mgr) 231void dss_mgr_start_update(enum omap_channel channel)
232{ 232{
233 dss_mgr_ops->start_update(mgr->id); 233 dss_mgr_ops->start_update(channel);
234} 234}
235EXPORT_SYMBOL(dss_mgr_start_update); 235EXPORT_SYMBOL(dss_mgr_start_update);
236 236