diff options
author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2015-11-04 20:23:37 +0200 |
---|---|---|
committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2016-03-03 17:38:22 +0200 |
commit | bdac3bb946f1bb9a38eb15df755b579b6dc56834 (patch) | |
tree | a2790a1a527f28eb62dc0c45be0eb7ae05177add /drivers/gpu/drm/omapdrm/dss/venc.c | |
parent | drm/omap: convert dss_mgr_connect to accept omap_channel (diff) | |
download | linux-dev-bdac3bb946f1bb9a38eb15df755b579b6dc56834.tar.xz linux-dev-bdac3bb946f1bb9a38eb15df755b579b6dc56834.zip |
drm/omap: convert dss_mgr_disconnect to accept omap_channel
We are removing uses of 'struct omap_overlay_manager'. This patch
changes dss_mgr_disconnect() 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/drm/omapdrm/dss/venc.c')
-rw-r--r-- | drivers/gpu/drm/omapdrm/dss/venc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/omapdrm/dss/venc.c b/drivers/gpu/drm/omapdrm/dss/venc.c index afc97891d476..2a4bd2537040 100644 --- a/drivers/gpu/drm/omapdrm/dss/venc.c +++ b/drivers/gpu/drm/omapdrm/dss/venc.c @@ -761,7 +761,7 @@ static int venc_connect(struct omap_dss_device *dssdev, if (r) { DSSERR("failed to connect output to new device: %s\n", dst->name); - dss_mgr_disconnect(mgr, dssdev); + dss_mgr_disconnect(mgr->id, dssdev); return r; } @@ -779,7 +779,7 @@ static void venc_disconnect(struct omap_dss_device *dssdev, omapdss_output_unset_device(dssdev); if (dssdev->manager) - dss_mgr_disconnect(dssdev->manager, dssdev); + dss_mgr_disconnect(dssdev->manager->id, dssdev); } static const struct omapdss_atv_ops venc_ops = { |