media: subdev: Support non-routing subdevs in v4l2_subdev_s_stream_helper()

At the moment v4l2_subdev_s_stream_helper() only works for subdevices
that support routing. As enable/disable_streams now also works for
subdevices without routing, improve v4l2_subdev_s_stream_helper() to do
the same.

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Tested-by: Umang Jain <umang.jain@ideasonboard.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>

diff --git a/drivers/media/v4l2-core/v4l2-subdev.c b/drivers/media/v4l2-core/v4l2-subdev.c
index 2a236f7e9f2b363891bb72d1b0e4bdacd8c41ff1..4f71199bf5920dbc702e6bcc0ab822e245e1a5cb 100644 (file)
--- a/drivers/media/v4l2-core/v4l2-subdev.c
+++ b/drivers/media/v4l2-core/v4l2-subdev.c
@@ -2422,15 +2422,24 @@ int v4l2_subdev_s_stream_helper(struct v4l2_subdev *sd, int enable)
        if (WARN_ON(pad_index == -1))
                return -EINVAL;
 
-       /*
-        * As there's a single source pad, just collect all the source streams.
-        */
-       state = v4l2_subdev_lock_and_get_active_state(sd);
+       if (sd->flags & V4L2_SUBDEV_FL_STREAMS) {
+               /*
+                * As there's a single source pad, just collect all the source
+                * streams.
+                */
+               state = v4l2_subdev_lock_and_get_active_state(sd);
 
-       for_each_active_route(&state->routing, route)
-               source_mask |= BIT_ULL(route->source_stream);
+               for_each_active_route(&state->routing, route)
+                       source_mask |= BIT_ULL(route->source_stream);
 
-       v4l2_subdev_unlock_state(state);
+               v4l2_subdev_unlock_state(state);
+       } else {
+               /*
+                * For non-streams subdevices, there's a single implicit stream
+                * per pad.
+                */
+               source_mask = BIT_ULL(0);
+       }
 
        if (enable)
                return v4l2_subdev_enable_streams(sd, pad_index, source_mask);