Re: [PATCH v5 09/11] media: imx219: Introduce the set_routing operation

[Laurent Pinchart <laurent.pinchart@ideasonboard.com>]

Hi Jean-Michel,

Thank you for the patch.

On Tue, Feb 08, 2022 at 04:50:25PM +0100, Jean-Michel Hautbois wrote:
> As we want to use multiplexed streams API, we need to be able to set the
> pad routing. Introduce the set_routing operation.
> 
> As this operation is required for a multiplexed able sensor, add the
> V4L2_SUBDEV_FL_MULTIPLEXED flag.
> 
> Signed-off-by: Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com>
> ---
>  drivers/media/i2c/imx219.c | 82 ++++++++++++++++++++++++++++++++++++--
>  1 file changed, 79 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/media/i2c/imx219.c b/drivers/media/i2c/imx219.c
> index abcaee15c4a0..35b61fad8e35 100644
> --- a/drivers/media/i2c/imx219.c
> +++ b/drivers/media/i2c/imx219.c
> @@ -118,6 +118,10 @@
>  #define IMX219_PIXEL_ARRAY_WIDTH	3280U
>  #define IMX219_PIXEL_ARRAY_HEIGHT	2464U
>  
> +/* Embedded metadata stream structure */
> +#define IMX219_EMBEDDED_LINE_WIDTH	16384
> +#define IMX219_NUM_EMBEDDED_LINES	1
> +
>  struct imx219_reg {
>  	u16 address;
>  	u8 val;
> @@ -784,15 +788,85 @@ static void imx219_init_formats(struct v4l2_subdev_state *state)
>  	format->height = supported_modes[0].height;
>  	format->field = V4L2_FIELD_NONE;
>  	format->colorspace = V4L2_COLORSPACE_RAW;
> +
> +	if (state->routing.routes[1].flags & V4L2_SUBDEV_ROUTE_FL_ACTIVE) {

There's no guarantee the routing table will have 2 entries.

> +		format = v4l2_state_get_stream_format(state, 0, 1);
> +		format->code = MEDIA_BUS_FMT_METADATA_8;
> +		format->width = IMX219_EMBEDDED_LINE_WIDTH;
> +		format->height = 1;
> +		format->field = V4L2_FIELD_NONE;
> +		format->colorspace = V4L2_COLORSPACE_DEFAULT;
> +	}
>  }
>  
> -static int imx219_init_cfg(struct v4l2_subdev *sd,
> -			   struct v4l2_subdev_state *state)
> +static int __imx219_set_routing(struct v4l2_subdev *sd,
> +				struct v4l2_subdev_state *state)
>  {
> +	struct v4l2_subdev_route routes[] = {
> +		{
> +			.source_pad = 0,
> +			.source_stream = 0,
> +			.flags = V4L2_SUBDEV_ROUTE_FL_IMMUTABLE |
> +				 V4L2_SUBDEV_ROUTE_FL_SOURCE |
> +				 V4L2_SUBDEV_ROUTE_FL_ACTIVE,
> +		},
> +		{

		}, {

> +			.source_pad = 0,
> +			.source_stream = 1,
> +			.flags = V4L2_SUBDEV_ROUTE_FL_SOURCE |
> +				 V4L2_SUBDEV_ROUTE_FL_ACTIVE,
> +		}
> +	};

That doesn't look right. You're hardcoding the routes, disregarding
completely what userspace wants to program. This default configuration
must move to .init_cfg().

> +
> +	struct v4l2_subdev_krouting routing = {
> +		.num_routes = ARRAY_SIZE(routes),
> +		.routes = routes,
> +	};
> +
> +	int ret;
> +
> +	ret = v4l2_subdev_set_routing(sd, state, &routing);
> +	if (ret)
> +		return ret;
> +
>  	imx219_init_formats(state);
> +
>  	return 0;
>  }
>  
> +static int imx219_set_routing(struct v4l2_subdev *sd,
> +			      struct v4l2_subdev_state *state,
> +			      enum v4l2_subdev_format_whence which,
> +			      struct v4l2_subdev_krouting *routing)
> +{
> +	int ret;
> +
> +	if (routing->num_routes == 0 || routing->num_routes > 2)
> +		return -EINVAL;
> +
> +	v4l2_subdev_lock_state(state);

Note for the future: v11 of the V4L2 streams series will handle locking
in the code, so you'll have to drop this (same in .init_cfg()).

> +
> +	ret = __imx219_set_routing(sd, state);
> +
> +	v4l2_subdev_unlock_state(state);
> +
> +	return ret;
> +}
> +
> +static int imx219_init_cfg(struct v4l2_subdev *sd,
> +			   struct v4l2_subdev_state *state)
> +{
> +	int ret;
> +
> +	v4l2_subdev_lock_state(state);
> +
> +	ret = __imx219_set_routing(sd, state);
> +
> +	v4l2_subdev_unlock_state(state);
> +
> +	return ret;
> +}
> +
>  static int imx219_enum_mbus_code(struct v4l2_subdev *sd,
>  				 struct v4l2_subdev_state *sd_state,
>  				 struct v4l2_subdev_mbus_code_enum *code)
> @@ -1251,6 +1325,7 @@ static const struct v4l2_subdev_pad_ops imx219_pad_ops = {
>  	.get_fmt		= imx219_get_pad_format,
>  	.set_fmt		= imx219_set_pad_format,
>  	.get_selection		= imx219_get_selection,
> +	.set_routing		= imx219_set_routing,
>  	.enum_frame_size	= imx219_enum_frame_size,
>  };
>  
> @@ -1509,7 +1584,8 @@ static int imx219_probe(struct i2c_client *client)
>  
>  	/* Initialize subdev */
>  	imx219->sd.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE |
> -			    V4L2_SUBDEV_FL_HAS_EVENTS;
> +			    V4L2_SUBDEV_FL_HAS_EVENTS |
> +			    V4L2_SUBDEV_FL_MULTIPLEXED;
>  	imx219->sd.entity.function = MEDIA_ENT_F_CAM_SENSOR;
>  
>  	/* Initialize source pad */

-- 
Regards,

Laurent Pinchart

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel