leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/omap: convert dss_mgr_enable to accept omap_channel

Browse Source 
We are removing uses of 'struct omap_overlay_manager'. This patch
changes dss_mgr_enable() 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:27:31 +02:00
parent bb772e1abf
commit 85a8c62250
9 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/dispc-compat.c
View File

@ -390,7 +390,7 @@ static void dispc_error_worker(struct work_struct *work)
ovl->disable(ovl); ovl->disable(ovl);
} }
dss_mgr_enable(mgr); dss_mgr_enable(mgr->id);
} }
} }

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

@ -429,7 +429,7 @@ static int dpi_display_enable(struct omap_dss_device *dssdev)
mdelay(2); mdelay(2);
r = dss_mgr_enable(out->manager); r = dss_mgr_enable(out->manager->id);
if (r) if (r)
goto err_mgr_enable; goto err_mgr_enable;

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

@ -3876,7 +3876,7 @@ static int dsi_enable_video_output(struct omap_dss_device *dssdev, int channel)
dsi_if_enable(dsidev, true); dsi_if_enable(dsidev, true);
} }
r = dss_mgr_enable(mgr); r = dss_mgr_enable(mgr->id);
if (r) if (r)
goto err_mgr_enable; goto err_mgr_enable;

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

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

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

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

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

@ -90,7 +90,7 @@ 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(enum omap_channel channel, void dss_mgr_set_lcd_config(enum omap_channel channel,
const struct dss_lcd_mgr_config *config); const struct dss_lcd_mgr_config *config);
int dss_mgr_enable(struct omap_overlay_manager *mgr); int dss_mgr_enable(enum omap_channel channel);
void dss_mgr_disable(struct omap_overlay_manager *mgr); void dss_mgr_disable(struct omap_overlay_manager *mgr);
void dss_mgr_start_update(struct omap_overlay_manager *mgr); void dss_mgr_start_update(struct omap_overlay_manager *mgr);
int dss_mgr_register_framedone_handler(struct omap_overlay_manager *mgr, int dss_mgr_register_framedone_handler(struct omap_overlay_manager *mgr,

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

@ -216,9 +216,9 @@ void dss_mgr_set_lcd_config(enum omap_channel channel,
} }
EXPORT_SYMBOL(dss_mgr_set_lcd_config); EXPORT_SYMBOL(dss_mgr_set_lcd_config);
int dss_mgr_enable(struct omap_overlay_manager *mgr) int dss_mgr_enable(enum omap_channel channel)
{ {
return dss_mgr_ops->enable(mgr->id); return dss_mgr_ops->enable(channel);
} }
EXPORT_SYMBOL(dss_mgr_enable); EXPORT_SYMBOL(dss_mgr_enable);

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

@ -196,7 +196,7 @@ static int sdi_display_enable(struct omap_dss_device *dssdev)
goto err_sdi_enable; goto err_sdi_enable;
mdelay(2); mdelay(2);
r = dss_mgr_enable(out->manager); r = dss_mgr_enable(out->manager->id);
if (r) if (r)
goto err_mgr_enable; goto err_mgr_enable;

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

@ -475,7 +475,7 @@ static int venc_power_on(struct omap_dss_device *dssdev)
if (r) if (r)
goto err1; goto err1;
r = dss_mgr_enable(mgr); r = dss_mgr_enable(mgr->id);
if (r) if (r)
goto err2; goto err2;