On 05/10/2021 10:57, Tomi Valkeinen wrote: > v4l2_subdev_set_routing_with_fmt() is the same as > v4l2_subdev_set_routing(), but additionally initializes all the streams > with the given format. > > Signed-off-by: Tomi Valkeinen <tomi.valkeinen@xxxxxxxxxxxxxxxx> Reviewed-by: Hans Verkuil <hverkuil-cisco@xxxxxxxxx> > --- > drivers/media/v4l2-core/v4l2-subdev.c | 22 ++++++++++++++++++++++ > include/media/v4l2-subdev.h | 16 ++++++++++++++++ > 2 files changed, 38 insertions(+) > > diff --git a/drivers/media/v4l2-core/v4l2-subdev.c b/drivers/media/v4l2-core/v4l2-subdev.c > index d402ffeef560..22a9bea0fa85 100644 > --- a/drivers/media/v4l2-core/v4l2-subdev.c > +++ b/drivers/media/v4l2-core/v4l2-subdev.c > @@ -1464,6 +1464,28 @@ int v4l2_subdev_set_routing(struct v4l2_subdev *sd, > } > EXPORT_SYMBOL_GPL(v4l2_subdev_set_routing); > > +int v4l2_subdev_set_routing_with_fmt(struct v4l2_subdev *sd, > + struct v4l2_subdev_state *state, > + struct v4l2_subdev_krouting *routing, > + const struct v4l2_mbus_framefmt *fmt) > +{ > + struct v4l2_subdev_stream_configs *stream_configs; > + unsigned int i; > + int ret; > + > + ret = v4l2_subdev_set_routing(sd, state, routing); > + if (ret) > + return ret; > + > + stream_configs = &state->stream_configs; > + > + for (i = 0; i < stream_configs->num_configs; ++i) > + stream_configs->configs[i].fmt = *fmt; > + > + return 0; > +} > +EXPORT_SYMBOL_GPL(v4l2_subdev_set_routing_with_fmt); > + > struct v4l2_mbus_framefmt * > v4l2_state_get_stream_format(struct v4l2_subdev_state *state, unsigned int pad, > u32 stream) > diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h > index 04fca595aa91..1a4df0aafe8a 100644 > --- a/include/media/v4l2-subdev.h > +++ b/include/media/v4l2-subdev.h > @@ -1486,6 +1486,22 @@ int v4l2_subdev_set_routing(struct v4l2_subdev *sd, > struct v4l2_subdev_state *state, > struct v4l2_subdev_krouting *routing); > > +/** > + * v4l2_subdev_set_routing_with_fmt() - Set given routing and format to subdev > + * state > + * @sd: The subdevice > + * @state: The subdevice state > + * @routing: Routing that will be copied to subdev state > + * @fmt: Format used to initialize all the streams > + * > + * This is the same as v4l2_subdev_set_routing, but additionally initializes > + * all the streams using the given format. > + */ > +int v4l2_subdev_set_routing_with_fmt(struct v4l2_subdev *sd, > + struct v4l2_subdev_state *state, > + struct v4l2_subdev_krouting *routing, > + const struct v4l2_mbus_framefmt *fmt); > + > /** > * v4l2_state_get_stream_format() - Get pointer to a stream format > * @state: subdevice state >