mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
To: Umang Jain <umang.jain@ideasonboard.com>
Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org,
	Mauro Carvalho Chehab <mchehab@kernel.org>,
	Hans Verkuil <hverkuil@xs4all.nl>,
	Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
	Sakari Ailus <sakari.ailus@linux.intel.com>
Subject: Re: [PATCH v3 4/9] media: subdev: Fix use of sd->enabled_streams in call_s_stream()
Date: Thu, 11 Apr 2024 09:19:02 +0300	[thread overview]
Message-ID: <e9f0ed24-6e24-4575-8028-b62eac1f37c6@ideasonboard.com> (raw)
In-Reply-To: <a808c81c-2006-410e-ba8c-74c5405acbdf@ideasonboard.com>

On 11/04/2024 08:16, Umang Jain wrote:
> Hi Tomi,
> 
> Thank you for the patch
> 
> On 10/04/24 6:05 pm, Tomi Valkeinen wrote:
>> call_s_stream() uses sd->enabled_streams to track whether streaming has
>> already been enabled. However,
>> v4l2_subdev_enable/disable_streams_fallback(), which was the original
>> user of this field, already uses it, and
>> v4l2_subdev_enable/disable_streams_fallback() will call call_s_stream().
>>
>> This leads to a conflict as both functions set the field. Afaics, both
>> functions set the field to the same value, so it won't cause a runtime
>> bug, but it's still wrong and if we, e.g., change how
>> v4l2_subdev_enable/disable_streams_fallback() operates we might easily
>> cause bugs.
>>
>> Fix this by adding a new field, 'streaming_enabled', for
>> call_s_stream().
> 
> Just a suggestion, as this is only used in call_s_stream(), maybe naming 
> this field 's_stream_enabled' ?

Yes, I think that's a good idea.

  Tomi

> Rest looks good to me,
> 
> Reviewed-by: Umang Jain <umang.jain@ideasonboard.com>
> 
>>
>> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
>> ---
>>   drivers/media/v4l2-core/v4l2-subdev.c | 8 ++------
>>   include/media/v4l2-subdev.h           | 3 +++
>>   2 files changed, 5 insertions(+), 6 deletions(-)
>>
>> diff --git a/drivers/media/v4l2-core/v4l2-subdev.c 
>> b/drivers/media/v4l2-core/v4l2-subdev.c
>> index 606a909cd778..6cd353d83dfc 100644
>> --- a/drivers/media/v4l2-core/v4l2-subdev.c
>> +++ b/drivers/media/v4l2-core/v4l2-subdev.c
>> @@ -421,12 +421,8 @@ static int call_s_stream(struct v4l2_subdev *sd, 
>> int enable)
>>        * The .s_stream() operation must never be called to start or 
>> stop an
>>        * already started or stopped subdev. Catch offenders but don't 
>> return
>>        * an error yet to avoid regressions.
>> -     *
>> -     * As .s_stream() is mutually exclusive with the 
>> .enable_streams() and
>> -     * .disable_streams() operation, we can use the enabled_streams 
>> field
>> -     * to store the subdev streaming state.
>>        */
>> -    if (WARN_ON(!!sd->enabled_streams == !!enable))
>> +    if (WARN_ON(sd->streaming_enabled == !!enable))
>>           return 0;
>>       ret = sd->ops->video->s_stream(sd, enable);
>> @@ -437,7 +433,7 @@ static int call_s_stream(struct v4l2_subdev *sd, 
>> int enable)
>>       }
>>       if (!ret) {
>> -        sd->enabled_streams = enable ? BIT(0) : 0;
>> +        sd->streaming_enabled = enable;
>>           if (enable)
>>               v4l2_subdev_enable_privacy_led(sd);
>> diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h
>> index a9e6b8146279..f55d03e0acc1 100644
>> --- a/include/media/v4l2-subdev.h
>> +++ b/include/media/v4l2-subdev.h
>> @@ -1043,6 +1043,8 @@ struct v4l2_subdev_platform_data {
>>    *             v4l2_subdev_enable_streams() and
>>    *             v4l2_subdev_disable_streams() helper functions for 
>> fallback
>>    *             cases.
>> + * @streaming_enabled: Tracks whether streaming has been enabled with 
>> s_stream.
>> + *                     This is only for call_s_stream() internal use.
>>    *
>>    * Each instance of a subdev driver should create this struct, either
>>    * stand-alone or embedded in a larger struct.
>> @@ -1091,6 +1093,7 @@ struct v4l2_subdev {
>>        */
>>       struct v4l2_subdev_state *active_state;
>>       u64 enabled_streams;
>> +    bool streaming_enabled;
>>   };
>>
> 


  reply	other threads:[~2024-04-11  6:19 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-04-10 12:35 [PATCH v3 0/9] media: subdev: Improve stream enable/disable machinery Tomi Valkeinen
2024-04-10 12:35 ` [PATCH v3 1/9] media: subdev: Add privacy led helpers Tomi Valkeinen
2024-04-11  4:43   ` Umang Jain
2024-04-12 17:36   ` Laurent Pinchart
2024-04-10 12:35 ` [PATCH v3 2/9] media: subdev: Use v4l2_subdev_has_op() in v4l2_subdev_enable/disable_streams() Tomi Valkeinen
2024-04-11  4:43   ` Umang Jain
2024-04-12 17:38   ` Laurent Pinchart
2024-04-10 12:35 ` [PATCH v3 3/9] media: subdev: Add checks for subdev features Tomi Valkeinen
2024-04-11  5:34   ` Umang Jain
2024-04-11  6:18     ` Tomi Valkeinen
2024-04-12 17:41   ` Laurent Pinchart
2024-04-10 12:35 ` [PATCH v3 4/9] media: subdev: Fix use of sd->enabled_streams in call_s_stream() Tomi Valkeinen
2024-04-11  5:16   ` Umang Jain
2024-04-11  6:19     ` Tomi Valkeinen [this message]
2024-04-12 17:53   ` Laurent Pinchart
2024-04-10 12:35 ` [PATCH v3 5/9] media: subdev: Improve v4l2_subdev_enable/disable_streams_fallback Tomi Valkeinen
2024-04-12 18:13   ` Laurent Pinchart
2024-04-10 12:35 ` [PATCH v3 6/9] media: subdev: Add v4l2_subdev_is_streaming() Tomi Valkeinen
2024-04-12  4:02   ` Umang Jain
2024-04-12 18:15   ` Laurent Pinchart
2024-04-16 10:27     ` Tomi Valkeinen
2024-04-10 12:35 ` [PATCH v3 7/9] media: subdev: Support privacy led in v4l2_subdev_enable/disable_streams() Tomi Valkeinen
2024-04-11  4:58   ` Umang Jain
2024-04-12 18:20   ` Laurent Pinchart
2024-04-16 10:34     ` Tomi Valkeinen
2024-04-19 10:22       ` Laurent Pinchart
2024-04-10 12:35 ` [PATCH v3 8/9] media: subdev: Refactor v4l2_subdev_enable/disable_streams() Tomi Valkeinen
2024-04-12 18:45   ` Laurent Pinchart
2024-04-10 12:35 ` [PATCH v3 9/9] media: subdev: Support single-stream case in v4l2_subdev_enable/disable_streams() Tomi Valkeinen
2024-04-11 11:02   ` Umang Jain
2024-04-11 11:07     ` Tomi Valkeinen
2024-04-11 11:48       ` Umang Jain
2024-04-11 11:53         ` Tomi Valkeinen
2024-04-11 11:56           ` Umang Jain

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=e9f0ed24-6e24-4575-8028-b62eac1f37c6@ideasonboard.com \
    --to=tomi.valkeinen@ideasonboard.com \
    --cc=hverkuil@xs4all.nl \
    --cc=laurent.pinchart@ideasonboard.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-media@vger.kernel.org \
    --cc=mchehab@kernel.org \
    --cc=sakari.ailus@linux.intel.com \
    --cc=umang.jain@ideasonboard.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®