diff options
author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2015-11-04 20:21:48 +0200 |
---|---|---|
committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2016-03-03 17:38:22 +0200 |
commit | 1b07b0664aa9f36e5a79c82cff46722e587ab647 (patch) | |
tree | a9a412aa8c391cb69a4f746f877c80f3ba8a5a9d /drivers/gpu | |
parent | f1504ad00daeeb301936f8695be28edb61613b76 (diff) | |
download | op-kernel-dev-1b07b0664aa9f36e5a79c82cff46722e587ab647.zip op-kernel-dev-1b07b0664aa9f36e5a79c82cff46722e587ab647.tar.gz |
drm/omap: convert dss_mgr_connect to accept omap_channel
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>
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/drm/omapdrm/dss/dpi.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/omapdrm/dss/dsi.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/omapdrm/dss/hdmi4.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/omapdrm/dss/hdmi5.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/omapdrm/dss/omapdss.h | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/omapdrm/dss/output.c | 4 | ||||
-rw-r--r-- | drivers/gpu/drm/omapdrm/dss/sdi.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/omapdrm/dss/venc.c | 2 |
8 files changed, 9 insertions, 9 deletions
diff --git a/drivers/gpu/drm/omapdrm/dss/dpi.c b/drivers/gpu/drm/omapdrm/dss/dpi.c index c4ebc75..064401b 100644 --- a/drivers/gpu/drm/omapdrm/dss/dpi.c +++ b/drivers/gpu/drm/omapdrm/dss/dpi.c @@ -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; diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.c b/drivers/gpu/drm/omapdrm/dss/dsi.c index 5afbaac..3c5542a 100644 --- a/drivers/gpu/drm/omapdrm/dss/dsi.c +++ b/drivers/gpu/drm/omapdrm/dss/dsi.c @@ -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; diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi4.c b/drivers/gpu/drm/omapdrm/dss/hdmi4.c index 5d8a5ed..bbceea8 100644 --- a/drivers/gpu/drm/omapdrm/dss/hdmi4.c +++ b/drivers/gpu/drm/omapdrm/dss/hdmi4.c @@ -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; diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi5.c b/drivers/gpu/drm/omapdrm/dss/hdmi5.c index 24a1402..0b4105e 100644 --- a/drivers/gpu/drm/omapdrm/dss/hdmi5.c +++ b/drivers/gpu/drm/omapdrm/dss/hdmi5.c @@ -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; diff --git a/drivers/gpu/drm/omapdrm/dss/omapdss.h b/drivers/gpu/drm/omapdrm/dss/omapdss.h index 640ba08..44086ce 100644 --- a/drivers/gpu/drm/omapdrm/dss/omapdss.h +++ b/drivers/gpu/drm/omapdrm/dss/omapdss.h @@ -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); diff --git a/drivers/gpu/drm/omapdrm/dss/output.c b/drivers/gpu/drm/omapdrm/dss/output.c index 69e0813..24de7cd 100644 --- a/drivers/gpu/drm/omapdrm/dss/output.c +++ b/drivers/gpu/drm/omapdrm/dss/output.c @@ -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); diff --git a/drivers/gpu/drm/omapdrm/dss/sdi.c b/drivers/gpu/drm/omapdrm/dss/sdi.c index 33d36ab..93077f7 100644 --- a/drivers/gpu/drm/omapdrm/dss/sdi.c +++ b/drivers/gpu/drm/omapdrm/dss/sdi.c @@ -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; diff --git a/drivers/gpu/drm/omapdrm/dss/venc.c b/drivers/gpu/drm/omapdrm/dss/venc.c index 037c5b4..afc9789 100644 --- a/drivers/gpu/drm/omapdrm/dss/venc.c +++ b/drivers/gpu/drm/omapdrm/dss/venc.c @@ -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; |