Hi Jacopo,
Thank you for the patch.
On Sun, Oct 17, 2021 at 08:24:37PM +0200, Jacopo Mondi wrote:
> Create and initialize the v4l2_subdev_state for the max9286 driver in
> order to prepare to support routing operations and multiplexed streams.
>
> Create the subdevice state with v4l2_subdev_init_finalize() and
> implement the init_cfg() operation to guarantee the state is initialized
> correctly with the default device format.
>
> Remove the max9286_open() subdev internal operation as the format of the
> file-handle state is now initialized by init_cfg().
>
> Signed-off-by: Jacopo Mondi <jacopo+renesas@xxxxxxxxxx>
> ---
> drivers/media/i2c/max9286.c | 90 +++++++++++++++++++++++--------------
> 1 file changed, 57 insertions(+), 33 deletions(-)
>
> diff --git a/drivers/media/i2c/max9286.c b/drivers/media/i2c/max9286.c
> index 1b92d18a1f94..5997fe40509f 100644
> --- a/drivers/media/i2c/max9286.c
> +++ b/drivers/media/i2c/max9286.c
> @@ -215,6 +215,17 @@ static inline struct max9286_priv *sd_to_max9286(struct v4l2_subdev *sd)
> return container_of(sd, struct max9286_priv, sd);
> }
>
> +static const struct v4l2_mbus_framefmt max9286_default_format = {
> + .width = 1280,
> + .height = 800,
> + .code = MEDIA_BUS_FMT_UYVY8_1X16,
> + .colorspace = V4L2_COLORSPACE_SRGB,
> + .field = V4L2_FIELD_NONE,
> + .ycbcr_enc = V4L2_YCBCR_ENC_DEFAULT,
> + .quantization = V4L2_QUANTIZATION_DEFAULT,
> + .xfer_func = V4L2_XFER_FUNC_DEFAULT,
> +};
> +
> /* -----------------------------------------------------------------------------
> * I2C IO
> */
> @@ -822,11 +833,45 @@ static int max9286_get_fmt(struct v4l2_subdev *sd,
> return 0;
> }
>
> +static int max9286_init_cfg(struct v4l2_subdev *sd,
> + struct v4l2_subdev_state *state)
> +{
> + struct v4l2_subdev_route routes[MAX9286_NUM_GMSL];
> + struct max9286_priv *priv = sd_to_max9286(sd);
> + struct v4l2_subdev_krouting routing;
> + struct max9286_source *source;
> + unsigned int num_routes = 0;
> + int ret;
> +
> + /* Create a route for each enable source. */
> + for_each_source(priv, source) {
> + struct v4l2_subdev_route *route = &routes[num_routes++];
> + unsigned int idx = to_index(priv, source);
> +
> + route->sink_pad = idx;
> + route->sink_stream = 0;
> + route->source_pad = MAX9286_SRC_PAD;
> + route->source_stream = idx;
> + route->flags = V4L2_SUBDEV_ROUTE_FL_ACTIVE;
> + }
> +
> + routing.num_routes = num_routes;
> + routing.routes = routes;
> +
> + state = v4l2_subdev_validate_and_lock_state(sd, state);
> + ret = v4l2_subdev_set_routing_with_fmt(sd, state, &routing,
> + &max9286_default_format);
> + v4l2_subdev_unlock_state(state);
> +
> + return ret;
> +}
> +
> static const struct v4l2_subdev_video_ops max9286_video_ops = {
> .s_stream = max9286_s_stream,
> };
>
> static const struct v4l2_subdev_pad_ops max9286_pad_ops = {
> + .init_cfg = max9286_init_cfg,
> .enum_mbus_code = max9286_enum_mbus_code,
> .get_fmt = max9286_get_fmt,
> .set_fmt = max9286_set_fmt,
> @@ -837,35 +882,6 @@ static const struct v4l2_subdev_ops max9286_subdev_ops = {
> .pad = &max9286_pad_ops,
> };
>
> -static void max9286_init_format(struct v4l2_mbus_framefmt *fmt)
> -{
> - fmt->width = 1280;
> - fmt->height = 800;
> - fmt->code = MEDIA_BUS_FMT_UYVY8_1X16;
> - fmt->colorspace = V4L2_COLORSPACE_SRGB;
> - fmt->field = V4L2_FIELD_NONE;
> - fmt->ycbcr_enc = V4L2_YCBCR_ENC_DEFAULT;
> - fmt->quantization = V4L2_QUANTIZATION_DEFAULT;
> - fmt->xfer_func = V4L2_XFER_FUNC_DEFAULT;
> -}
> -
> -static int max9286_open(struct v4l2_subdev *subdev, struct v4l2_subdev_fh *fh)
> -{
> - struct v4l2_mbus_framefmt *format;
> - unsigned int i;
> -
> - for (i = 0; i < MAX9286_N_SINKS; i++) {
> - format = v4l2_subdev_get_try_format(subdev, fh->state, i);
> - max9286_init_format(format);
> - }
> -
> - return 0;
> -}
> -
> -static const struct v4l2_subdev_internal_ops max9286_subdev_internal_ops = {
> - .open = max9286_open,
> -};
> -
> static int max9286_s_ctrl(struct v4l2_ctrl *ctrl)
> {
> switch (ctrl->id) {
> @@ -897,11 +913,11 @@ static int max9286_v4l2_register(struct max9286_priv *priv)
> /* Configure V4L2 for the MAX9286 itself */
>
> for (i = 0; i < MAX9286_N_SINKS; i++)
> - max9286_init_format(&priv->fmt[i]);
> + priv->fmt[i] = max9286_default_format;
>
> v4l2_i2c_subdev_init(&priv->sd, priv->client, &max9286_subdev_ops);
> - priv->sd.internal_ops = &max9286_subdev_internal_ops;
> - priv->sd.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;
> + priv->sd.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE |
> + V4L2_SUBDEV_FL_MULTIPLEXED;
>
> v4l2_ctrl_handler_init(&priv->ctrls, 1);
> priv->pixelrate = v4l2_ctrl_new_std(&priv->ctrls,
> @@ -933,14 +949,21 @@ static int max9286_v4l2_register(struct max9286_priv *priv)
> }
> priv->sd.fwnode = ep;
>
> + ret = v4l2_subdev_init_finalize(&priv->sd);
> + if (ret)
> + goto err_put_node;
> +
> ret = v4l2_async_register_subdev(&priv->sd);
> if (ret < 0) {
> dev_err(dev, "Unable to register subdevice\n");
> - goto err_put_node;
> + goto err_free_state;
> }
>
> return 0;
>
> +err_free_state:
I'd call this new label err_subdev_cleanup.
> + v4l2_subdev_cleanup(&priv->sd);
> +
> err_put_node:
> fwnode_handle_put(ep);
> err_async:
> @@ -953,6 +976,7 @@ static void max9286_v4l2_unregister(struct max9286_priv *priv)
> {
> fwnode_handle_put(priv->sd.fwnode);
> v4l2_async_unregister_subdev(&priv->sd);
> + v4l2_subdev_cleanup(&priv->sd);
> max9286_v4l2_notifier_unregister(priv);
> }
>
--
Regards,
Laurent Pinchart
