| Message ID | 20240416-enable-streams-impro-v5-8-bd5fcea49388@ideasonboard.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | media: subdev: Improve stream enable/disable machinery | expand |
On 16/04/2024 15:55, Tomi Valkeinen wrote: > Add two internal helper functions, v4l2_subdev_collect_streams() and > v4l2_subdev_set_streams_enabled(), which allows us to refactor > v4l2_subdev_enable/disable_streams() functions. > > This (I think) makes the code a bit easier to read, and lets us more > easily add new functionality in the helper functions in the following > patch. > > Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com> > --- > drivers/media/v4l2-core/v4l2-subdev.c | 109 +++++++++++++++++++--------------- > 1 file changed, 60 insertions(+), 49 deletions(-) > > diff --git a/drivers/media/v4l2-core/v4l2-subdev.c b/drivers/media/v4l2-core/v4l2-subdev.c > index 38388b223564..e45fd42da1e3 100644 > --- a/drivers/media/v4l2-core/v4l2-subdev.c > +++ b/drivers/media/v4l2-core/v4l2-subdev.c > @@ -2100,6 +2100,42 @@ int v4l2_subdev_routing_validate(struct v4l2_subdev *sd, > } > EXPORT_SYMBOL_GPL(v4l2_subdev_routing_validate); > > +static void v4l2_subdev_collect_streams(struct v4l2_subdev *sd, > + struct v4l2_subdev_state *state, > + u32 pad, u64 streams_mask, > + u64 *found_streams, > + u64 *enabled_streams) > +{ > + *found_streams = 0; > + *enabled_streams = 0; > + > + for (unsigned int i = 0; i < state->stream_configs.num_configs; ++i) { > + const struct v4l2_subdev_stream_config *cfg = > + &state->stream_configs.configs[i]; > + > + if (cfg->pad != pad || !(streams_mask & BIT_ULL(cfg->stream))) > + continue; > + > + *found_streams |= BIT_ULL(cfg->stream); > + if (cfg->enabled) > + *enabled_streams |= BIT_ULL(cfg->stream); > + } > +} > + > +static void v4l2_subdev_set_streams_enabled(struct v4l2_subdev *sd, > + struct v4l2_subdev_state *state, > + u32 pad, u64 streams_mask, > + bool enabled) > +{ > + for (unsigned int i = 0; i < state->stream_configs.num_configs; ++i) { > + struct v4l2_subdev_stream_config *cfg = > + &state->stream_configs.configs[i]; > + > + if (cfg->pad == pad && (streams_mask & BIT_ULL(cfg->stream))) > + cfg->enabled = enabled; > + } > +} > + > static int v4l2_subdev_enable_streams_fallback(struct v4l2_subdev *sd, u32 pad, > u64 streams_mask) > { > @@ -2151,8 +2187,8 @@ int v4l2_subdev_enable_streams(struct v4l2_subdev *sd, u32 pad, > struct device *dev = sd->entity.graph_obj.mdev->dev; > struct v4l2_subdev_state *state; > bool already_streaming; > - u64 found_streams = 0; > - unsigned int i; > + u64 enabled_streams; > + u64 found_streams; > int ret; > > /* A few basic sanity checks first. */ > @@ -2173,22 +2209,9 @@ int v4l2_subdev_enable_streams(struct v4l2_subdev *sd, u32 pad, > * Verify that the requested streams exist and that they are not > * already enabled. > */ > - for (i = 0; i < state->stream_configs.num_configs; ++i) { > - struct v4l2_subdev_stream_config *cfg = > - &state->stream_configs.configs[i]; > > - if (cfg->pad != pad || !(streams_mask & BIT_ULL(cfg->stream))) > - continue; > - > - found_streams |= BIT_ULL(cfg->stream); > - > - if (cfg->enabled) { > - dev_dbg(dev, "stream %u already enabled on %s:%u\n", > - cfg->stream, sd->entity.name, pad); > - ret = -EALREADY; > - goto done; > - } > - } > + v4l2_subdev_collect_streams(sd, state, pad, streams_mask, > + &found_streams, &enabled_streams); > > if (found_streams != streams_mask) { > dev_dbg(dev, "streams 0x%llx not found on %s:%u\n", > @@ -2197,6 +2220,13 @@ int v4l2_subdev_enable_streams(struct v4l2_subdev *sd, u32 pad, > goto done; > } > > + if (enabled_streams) { > + dev_dbg(dev, "streams 0x%llx already enabled on %s:%u\n", > + enabled_streams, sd->entity.name, pad); > + ret = -EINVAL; > + goto done; > + } > + > dev_dbg(dev, "enable streams %u:%#llx\n", pad, streams_mask); > > already_streaming = v4l2_subdev_is_streaming(sd); > @@ -2211,13 +2241,7 @@ int v4l2_subdev_enable_streams(struct v4l2_subdev *sd, u32 pad, > } > > /* Mark the streams as enabled. */ > - for (i = 0; i < state->stream_configs.num_configs; ++i) { > - struct v4l2_subdev_stream_config *cfg = > - &state->stream_configs.configs[i]; > - > - if (cfg->pad == pad && (streams_mask & BIT_ULL(cfg->stream))) > - cfg->enabled = true; > - } > + v4l2_subdev_set_streams_enabled(sd, state, pad, streams_mask, true); > > if (!already_streaming) > v4l2_subdev_enable_privacy_led(sd); > @@ -2279,8 +2303,8 @@ int v4l2_subdev_disable_streams(struct v4l2_subdev *sd, u32 pad, > { > struct device *dev = sd->entity.graph_obj.mdev->dev; > struct v4l2_subdev_state *state; > - u64 found_streams = 0; > - unsigned int i; > + u64 enabled_streams; > + u64 found_streams; > int ret; > > /* A few basic sanity checks first. */ > @@ -2301,22 +2325,9 @@ int v4l2_subdev_disable_streams(struct v4l2_subdev *sd, u32 pad, > * Verify that the requested streams exist and that they are not > * already disabled. > */ > - for (i = 0; i < state->stream_configs.num_configs; ++i) { > - struct v4l2_subdev_stream_config *cfg = > - &state->stream_configs.configs[i]; > - > - if (cfg->pad != pad || !(streams_mask & BIT_ULL(cfg->stream))) > - continue; > > - found_streams |= BIT_ULL(cfg->stream); > - > - if (!cfg->enabled) { > - dev_dbg(dev, "stream %u already disabled on %s:%u\n", > - cfg->stream, sd->entity.name, pad); > - ret = -EALREADY; This used to return -EALREADY... > - goto done; > - } > - } > + v4l2_subdev_collect_streams(sd, state, pad, streams_mask, > + &found_streams, &enabled_streams); > > if (found_streams != streams_mask) { > dev_dbg(dev, "streams 0x%llx not found on %s:%u\n", > @@ -2325,6 +2336,13 @@ int v4l2_subdev_disable_streams(struct v4l2_subdev *sd, u32 pad, > goto done; > } > > + if (enabled_streams != streams_mask) { > + dev_dbg(dev, "streams 0x%llx already disabled on %s:%u\n", > + streams_mask & ~enabled_streams, sd->entity.name, pad); > + ret = -EINVAL; ...but now it returns -EINVAL. Is that intentional? I prefer EINVAL to be honest, but I was just wondering about this change. It looks like the next patch removes the last of the EALREADY error returns as well. Regards, Hans > + goto done; > + } > + > dev_dbg(dev, "disable streams %u:%#llx\n", pad, streams_mask); > > /* Call the .disable_streams() operation. */ > @@ -2336,14 +2354,7 @@ int v4l2_subdev_disable_streams(struct v4l2_subdev *sd, u32 pad, > goto done; > } > > - /* Mark the streams as disabled. */ > - for (i = 0; i < state->stream_configs.num_configs; ++i) { > - struct v4l2_subdev_stream_config *cfg = > - &state->stream_configs.configs[i]; > - > - if (cfg->pad == pad && (streams_mask & BIT_ULL(cfg->stream))) > - cfg->enabled = false; > - } > + v4l2_subdev_set_streams_enabled(sd, state, pad, streams_mask, false); > > done: > if (!v4l2_subdev_is_streaming(sd)) >
On 24/04/2024 11:41, Hans Verkuil wrote: > On 16/04/2024 15:55, Tomi Valkeinen wrote: >> Add two internal helper functions, v4l2_subdev_collect_streams() and >> v4l2_subdev_set_streams_enabled(), which allows us to refactor >> v4l2_subdev_enable/disable_streams() functions. >> >> This (I think) makes the code a bit easier to read, and lets us more >> easily add new functionality in the helper functions in the following >> patch. >> >> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> >> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com> >> --- >> drivers/media/v4l2-core/v4l2-subdev.c | 109 +++++++++++++++++++--------------- >> 1 file changed, 60 insertions(+), 49 deletions(-) >> >> diff --git a/drivers/media/v4l2-core/v4l2-subdev.c b/drivers/media/v4l2-core/v4l2-subdev.c >> index 38388b223564..e45fd42da1e3 100644 >> --- a/drivers/media/v4l2-core/v4l2-subdev.c >> +++ b/drivers/media/v4l2-core/v4l2-subdev.c >> @@ -2100,6 +2100,42 @@ int v4l2_subdev_routing_validate(struct v4l2_subdev *sd, >> } >> EXPORT_SYMBOL_GPL(v4l2_subdev_routing_validate); >> >> +static void v4l2_subdev_collect_streams(struct v4l2_subdev *sd, >> + struct v4l2_subdev_state *state, >> + u32 pad, u64 streams_mask, >> + u64 *found_streams, >> + u64 *enabled_streams) >> +{ >> + *found_streams = 0; >> + *enabled_streams = 0; >> + >> + for (unsigned int i = 0; i < state->stream_configs.num_configs; ++i) { >> + const struct v4l2_subdev_stream_config *cfg = >> + &state->stream_configs.configs[i]; >> + >> + if (cfg->pad != pad || !(streams_mask & BIT_ULL(cfg->stream))) >> + continue; >> + >> + *found_streams |= BIT_ULL(cfg->stream); >> + if (cfg->enabled) >> + *enabled_streams |= BIT_ULL(cfg->stream); >> + } >> +} >> + >> +static void v4l2_subdev_set_streams_enabled(struct v4l2_subdev *sd, >> + struct v4l2_subdev_state *state, >> + u32 pad, u64 streams_mask, >> + bool enabled) >> +{ >> + for (unsigned int i = 0; i < state->stream_configs.num_configs; ++i) { >> + struct v4l2_subdev_stream_config *cfg = >> + &state->stream_configs.configs[i]; >> + >> + if (cfg->pad == pad && (streams_mask & BIT_ULL(cfg->stream))) >> + cfg->enabled = enabled; >> + } >> +} >> + >> static int v4l2_subdev_enable_streams_fallback(struct v4l2_subdev *sd, u32 pad, >> u64 streams_mask) >> { >> @@ -2151,8 +2187,8 @@ int v4l2_subdev_enable_streams(struct v4l2_subdev *sd, u32 pad, >> struct device *dev = sd->entity.graph_obj.mdev->dev; >> struct v4l2_subdev_state *state; >> bool already_streaming; >> - u64 found_streams = 0; >> - unsigned int i; >> + u64 enabled_streams; >> + u64 found_streams; >> int ret; >> >> /* A few basic sanity checks first. */ >> @@ -2173,22 +2209,9 @@ int v4l2_subdev_enable_streams(struct v4l2_subdev *sd, u32 pad, >> * Verify that the requested streams exist and that they are not >> * already enabled. >> */ >> - for (i = 0; i < state->stream_configs.num_configs; ++i) { >> - struct v4l2_subdev_stream_config *cfg = >> - &state->stream_configs.configs[i]; >> >> - if (cfg->pad != pad || !(streams_mask & BIT_ULL(cfg->stream))) >> - continue; >> - >> - found_streams |= BIT_ULL(cfg->stream); >> - >> - if (cfg->enabled) { >> - dev_dbg(dev, "stream %u already enabled on %s:%u\n", >> - cfg->stream, sd->entity.name, pad); >> - ret = -EALREADY; >> - goto done; >> - } >> - } >> + v4l2_subdev_collect_streams(sd, state, pad, streams_mask, >> + &found_streams, &enabled_streams); >> >> if (found_streams != streams_mask) { >> dev_dbg(dev, "streams 0x%llx not found on %s:%u\n", >> @@ -2197,6 +2220,13 @@ int v4l2_subdev_enable_streams(struct v4l2_subdev *sd, u32 pad, >> goto done; >> } >> >> + if (enabled_streams) { >> + dev_dbg(dev, "streams 0x%llx already enabled on %s:%u\n", >> + enabled_streams, sd->entity.name, pad); >> + ret = -EINVAL; >> + goto done; >> + } >> + >> dev_dbg(dev, "enable streams %u:%#llx\n", pad, streams_mask); >> >> already_streaming = v4l2_subdev_is_streaming(sd); >> @@ -2211,13 +2241,7 @@ int v4l2_subdev_enable_streams(struct v4l2_subdev *sd, u32 pad, >> } >> >> /* Mark the streams as enabled. */ >> - for (i = 0; i < state->stream_configs.num_configs; ++i) { >> - struct v4l2_subdev_stream_config *cfg = >> - &state->stream_configs.configs[i]; >> - >> - if (cfg->pad == pad && (streams_mask & BIT_ULL(cfg->stream))) >> - cfg->enabled = true; >> - } >> + v4l2_subdev_set_streams_enabled(sd, state, pad, streams_mask, true); >> >> if (!already_streaming) >> v4l2_subdev_enable_privacy_led(sd); >> @@ -2279,8 +2303,8 @@ int v4l2_subdev_disable_streams(struct v4l2_subdev *sd, u32 pad, >> { >> struct device *dev = sd->entity.graph_obj.mdev->dev; >> struct v4l2_subdev_state *state; >> - u64 found_streams = 0; >> - unsigned int i; >> + u64 enabled_streams; >> + u64 found_streams; >> int ret; >> >> /* A few basic sanity checks first. */ >> @@ -2301,22 +2325,9 @@ int v4l2_subdev_disable_streams(struct v4l2_subdev *sd, u32 pad, >> * Verify that the requested streams exist and that they are not >> * already disabled. >> */ >> - for (i = 0; i < state->stream_configs.num_configs; ++i) { >> - struct v4l2_subdev_stream_config *cfg = >> - &state->stream_configs.configs[i]; >> - >> - if (cfg->pad != pad || !(streams_mask & BIT_ULL(cfg->stream))) >> - continue; >> >> - found_streams |= BIT_ULL(cfg->stream); >> - >> - if (!cfg->enabled) { >> - dev_dbg(dev, "stream %u already disabled on %s:%u\n", >> - cfg->stream, sd->entity.name, pad); >> - ret = -EALREADY; > > This used to return -EALREADY... > >> - goto done; >> - } >> - } >> + v4l2_subdev_collect_streams(sd, state, pad, streams_mask, >> + &found_streams, &enabled_streams); >> >> if (found_streams != streams_mask) { >> dev_dbg(dev, "streams 0x%llx not found on %s:%u\n", >> @@ -2325,6 +2336,13 @@ int v4l2_subdev_disable_streams(struct v4l2_subdev *sd, u32 pad, >> goto done; >> } >> >> + if (enabled_streams != streams_mask) { >> + dev_dbg(dev, "streams 0x%llx already disabled on %s:%u\n", >> + streams_mask & ~enabled_streams, sd->entity.name, pad); >> + ret = -EINVAL; > > ...but now it returns -EINVAL. > > Is that intentional? No. I think it was a copy-paste thing. > I prefer EINVAL to be honest, but I was just wondering about this change. > > It looks like the next patch removes the last of the EALREADY error returns > as well. Good catch. We document that the enable_streams() returns EALREADY if a stream is already enabled, so lets stick to that. I'll update the patches. Tomi
diff --git a/drivers/media/v4l2-core/v4l2-subdev.c b/drivers/media/v4l2-core/v4l2-subdev.c index 38388b223564..e45fd42da1e3 100644 --- a/drivers/media/v4l2-core/v4l2-subdev.c +++ b/drivers/media/v4l2-core/v4l2-subdev.c @@ -2100,6 +2100,42 @@ int v4l2_subdev_routing_validate(struct v4l2_subdev *sd, } EXPORT_SYMBOL_GPL(v4l2_subdev_routing_validate); +static void v4l2_subdev_collect_streams(struct v4l2_subdev *sd, + struct v4l2_subdev_state *state, + u32 pad, u64 streams_mask, + u64 *found_streams, + u64 *enabled_streams) +{ + *found_streams = 0; + *enabled_streams = 0; + + for (unsigned int i = 0; i < state->stream_configs.num_configs; ++i) { + const struct v4l2_subdev_stream_config *cfg = + &state->stream_configs.configs[i]; + + if (cfg->pad != pad || !(streams_mask & BIT_ULL(cfg->stream))) + continue; + + *found_streams |= BIT_ULL(cfg->stream); + if (cfg->enabled) + *enabled_streams |= BIT_ULL(cfg->stream); + } +} + +static void v4l2_subdev_set_streams_enabled(struct v4l2_subdev *sd, + struct v4l2_subdev_state *state, + u32 pad, u64 streams_mask, + bool enabled) +{ + for (unsigned int i = 0; i < state->stream_configs.num_configs; ++i) { + struct v4l2_subdev_stream_config *cfg = + &state->stream_configs.configs[i]; + + if (cfg->pad == pad && (streams_mask & BIT_ULL(cfg->stream))) + cfg->enabled = enabled; + } +} + static int v4l2_subdev_enable_streams_fallback(struct v4l2_subdev *sd, u32 pad, u64 streams_mask) { @@ -2151,8 +2187,8 @@ int v4l2_subdev_enable_streams(struct v4l2_subdev *sd, u32 pad, struct device *dev = sd->entity.graph_obj.mdev->dev; struct v4l2_subdev_state *state; bool already_streaming; - u64 found_streams = 0; - unsigned int i; + u64 enabled_streams; + u64 found_streams; int ret; /* A few basic sanity checks first. */ @@ -2173,22 +2209,9 @@ int v4l2_subdev_enable_streams(struct v4l2_subdev *sd, u32 pad, * Verify that the requested streams exist and that they are not * already enabled. */ - for (i = 0; i < state->stream_configs.num_configs; ++i) { - struct v4l2_subdev_stream_config *cfg = - &state->stream_configs.configs[i]; - if (cfg->pad != pad || !(streams_mask & BIT_ULL(cfg->stream))) - continue; - - found_streams |= BIT_ULL(cfg->stream); - - if (cfg->enabled) { - dev_dbg(dev, "stream %u already enabled on %s:%u\n", - cfg->stream, sd->entity.name, pad); - ret = -EALREADY; - goto done; - } - } + v4l2_subdev_collect_streams(sd, state, pad, streams_mask, + &found_streams, &enabled_streams); if (found_streams != streams_mask) { dev_dbg(dev, "streams 0x%llx not found on %s:%u\n", @@ -2197,6 +2220,13 @@ int v4l2_subdev_enable_streams(struct v4l2_subdev *sd, u32 pad, goto done; } + if (enabled_streams) { + dev_dbg(dev, "streams 0x%llx already enabled on %s:%u\n", + enabled_streams, sd->entity.name, pad); + ret = -EINVAL; + goto done; + } + dev_dbg(dev, "enable streams %u:%#llx\n", pad, streams_mask); already_streaming = v4l2_subdev_is_streaming(sd); @@ -2211,13 +2241,7 @@ int v4l2_subdev_enable_streams(struct v4l2_subdev *sd, u32 pad, } /* Mark the streams as enabled. */ - for (i = 0; i < state->stream_configs.num_configs; ++i) { - struct v4l2_subdev_stream_config *cfg = - &state->stream_configs.configs[i]; - - if (cfg->pad == pad && (streams_mask & BIT_ULL(cfg->stream))) - cfg->enabled = true; - } + v4l2_subdev_set_streams_enabled(sd, state, pad, streams_mask, true); if (!already_streaming) v4l2_subdev_enable_privacy_led(sd); @@ -2279,8 +2303,8 @@ int v4l2_subdev_disable_streams(struct v4l2_subdev *sd, u32 pad, { struct device *dev = sd->entity.graph_obj.mdev->dev; struct v4l2_subdev_state *state; - u64 found_streams = 0; - unsigned int i; + u64 enabled_streams; + u64 found_streams; int ret; /* A few basic sanity checks first. */ @@ -2301,22 +2325,9 @@ int v4l2_subdev_disable_streams(struct v4l2_subdev *sd, u32 pad, * Verify that the requested streams exist and that they are not * already disabled. */ - for (i = 0; i < state->stream_configs.num_configs; ++i) { - struct v4l2_subdev_stream_config *cfg = - &state->stream_configs.configs[i]; - - if (cfg->pad != pad || !(streams_mask & BIT_ULL(cfg->stream))) - continue; - found_streams |= BIT_ULL(cfg->stream); - - if (!cfg->enabled) { - dev_dbg(dev, "stream %u already disabled on %s:%u\n", - cfg->stream, sd->entity.name, pad); - ret = -EALREADY; - goto done; - } - } + v4l2_subdev_collect_streams(sd, state, pad, streams_mask, + &found_streams, &enabled_streams); if (found_streams != streams_mask) { dev_dbg(dev, "streams 0x%llx not found on %s:%u\n", @@ -2325,6 +2336,13 @@ int v4l2_subdev_disable_streams(struct v4l2_subdev *sd, u32 pad, goto done; } + if (enabled_streams != streams_mask) { + dev_dbg(dev, "streams 0x%llx already disabled on %s:%u\n", + streams_mask & ~enabled_streams, sd->entity.name, pad); + ret = -EINVAL; + goto done; + } + dev_dbg(dev, "disable streams %u:%#llx\n", pad, streams_mask); /* Call the .disable_streams() operation. */ @@ -2336,14 +2354,7 @@ int v4l2_subdev_disable_streams(struct v4l2_subdev *sd, u32 pad, goto done; } - /* Mark the streams as disabled. */ - for (i = 0; i < state->stream_configs.num_configs; ++i) { - struct v4l2_subdev_stream_config *cfg = - &state->stream_configs.configs[i]; - - if (cfg->pad == pad && (streams_mask & BIT_ULL(cfg->stream))) - cfg->enabled = false; - } + v4l2_subdev_set_streams_enabled(sd, state, pad, streams_mask, false); done: if (!v4l2_subdev_is_streaming(sd))