drm/omap: remove ovl_set_channel_out

At the moment we have ovl_set_channel_out() to configure the output
channel of an overlay. It makes sense to have this configuration as part
of the rest of overlay configuration, and in DSS6+ we need the output
channel when doing the other overlay configuration.

This patch adds a 'channel' parameter to ovl_setup(), so that all
overlay configuration is done via the same function, and removes the
ovl_set_channel_out().

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

1 files changed, 2 insertions, 4 deletions

diff --git a/drivers/gpu/drm/omapdrm/omap_plane.c b/drivers/gpu/drm/omapdrm/omap_plane.c
index a55e7db7e445..8b343aa84098 100644
--- a/drivers/gpu/drm/omapdrm/omap_plane.c
+++ b/drivers/gpu/drm/omapdrm/omap_plane.c
@@ -105,12 +105,10 @@ static void omap_plane_atomic_update(struct drm_plane *plane,
         DBG("%d,%d %pad %pad", info.pos_x, info.pos_y,
                         &info.paddr, &info.p_uv_addr);
 
-        priv->dispc_ops->ovl_set_channel_out(omap_plane->id,
-                                  omap_crtc_channel(state->crtc));
-
         /* and finally, update omapdss: */
         ret = priv->dispc_ops->ovl_setup(omap_plane->id, &info,
-                              omap_crtc_timings(state->crtc), false);
+                              omap_crtc_timings(state->crtc), false,
+                              omap_crtc_channel(state->crtc));
         if (ret) {
                 dev_err(plane->dev->dev, "Failed to setup plane %s\n",
                         omap_plane->name);