Hi Tomi,
Thank you for the patch.
On Tue, Apr 16, 2024 at 04:55:13PM +0300, Tomi Valkeinen wrote:
> 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.
>
> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@xxxxxxxxxxxxxxxx>
Reviewed-by: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>
> ---
> drivers/media/v4l2-core/v4l2-subdev.c | 23 ++++++++++++++++-------
> 1 file changed, 16 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/media/v4l2-core/v4l2-subdev.c b/drivers/media/v4l2-core/v4l2-subdev.c
> index 10406acfb9d0..64f52376ca7b 100644
> --- a/drivers/media/v4l2-core/v4l2-subdev.c
> +++ b/drivers/media/v4l2-core/v4l2-subdev.c
> @@ -2360,15 +2360,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);
--
Regards,
Laurent Pinchart
