[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <271933b0-7ac1-4fdf-b66a-0ed860a1ec8f@ideasonboard.com>
Date: Tue, 16 Apr 2024 13:43:31 +0300
From: Tomi Valkeinen <tomi.valkeinen@...asonboard.com>
To: Umang Jain <umang.jain@...asonboard.com>
Cc: linux-media@...r.kernel.org, linux-kernel@...r.kernel.org,
Mauro Carvalho Chehab <mchehab@...nel.org>, Hans Verkuil
<hverkuil@...all.nl>, Laurent Pinchart <laurent.pinchart@...asonboard.com>,
Sakari Ailus <sakari.ailus@...ux.intel.com>
Subject: Re: [PATCH v4 10/10] media: subdev: Support non-routing subdevs in
v4l2_subdev_s_stream_helper()
Hi,
On 16/04/2024 13:40, 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.
I forgot to mention, I have not tested this patch as I don't have a HW
setup. And, of course, I now see that it has a bug. The BIT_ULL(1)
should be BIT_ULL(0).
Umang, can you try a fixed one on your side? If it works, I'll send a v5.
Tomi
> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@...asonboard.com>
> ---
> 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 1c6b305839a1..83ebcde54a34 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(1);
> + }
>
> if (enable)
> return v4l2_subdev_enable_streams(sd, pad_index, source_mask);
>
Powered by blists - more mailing lists