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

drm/omap: convert dss_mgr_connect to accept omap_channel

Browse Source 
We are removing uses of 'struct omap_overlay_manager'. This patch
changes dss_mgr_connect() 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:21:48 +02:00
parent f1504ad00d
commit 1b07b0664a
8 changed files with 9 additions and 9 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

@ -676,7 +676,7 @@ static int dpi_connect(struct omap_dss_device *dssdev,
if (!mgr)
return -ENODEV;
r = dss_mgr_connect(mgr, dssdev);
r = dss_mgr_connect(mgr->id, dssdev);
if (r)
return r;

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

@ -4994,7 +4994,7 @@ static int dsi_connect(struct omap_dss_device *dssdev,
if (!mgr)
return -ENODEV;
r = dss_mgr_connect(mgr, dssdev);
r = dss_mgr_connect(mgr->id, dssdev);
if (r)
return r;

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

@ -449,7 +449,7 @@ static int hdmi_connect(struct omap_dss_device *dssdev,
if (!mgr)
return -ENODEV;
r = dss_mgr_connect(mgr, dssdev);
r = dss_mgr_connect(mgr->id, dssdev);
if (r)
return r;

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

@ -475,7 +475,7 @@ static int hdmi_connect(struct omap_dss_device *dssdev,
if (!mgr)
return -ENODEV;
r = dss_mgr_connect(mgr, dssdev);
r = dss_mgr_connect(mgr->id, dssdev);
if (r)
return r;

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

@ -82,7 +82,7 @@ struct dss_mgr_ops {
int dss_install_mgr_ops(const struct dss_mgr_ops *mgr_ops);
void dss_uninstall_mgr_ops(void);
int dss_mgr_connect(struct omap_overlay_manager *mgr,
int dss_mgr_connect(enum omap_channel channel,
struct omap_dss_device *dst);
void dss_mgr_disconnect(struct omap_overlay_manager *mgr,
struct omap_dss_device *dst);

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

@ -188,10 +188,10 @@ void dss_uninstall_mgr_ops(void)
}
EXPORT_SYMBOL(dss_uninstall_mgr_ops);
int dss_mgr_connect(struct omap_overlay_manager *mgr,
int dss_mgr_connect(enum omap_channel channel,
struct omap_dss_device *dst)
{
return dss_mgr_ops->connect(mgr->id, dst);
return dss_mgr_ops->connect(channel, dst);
}
EXPORT_SYMBOL(dss_mgr_connect);

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

@ -291,7 +291,7 @@ static int sdi_connect(struct omap_dss_device *dssdev,
if (!mgr)
return -ENODEV;
r = dss_mgr_connect(mgr, dssdev);
r = dss_mgr_connect(mgr->id, dssdev);
if (r)
return r;

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

@ -753,7 +753,7 @@ static int venc_connect(struct omap_dss_device *dssdev,
if (!mgr)
return -ENODEV;
r = dss_mgr_connect(mgr, dssdev);
r = dss_mgr_connect(mgr->id, dssdev);
if (r)
return r;