Hi Jacopo,
Thank you for the patch.
On Mon, May 06, 2024 at 06:49:34PM +0200, Jacopo Mondi wrote:
> The adv748x-csi2 driver configures the CSI-2 transmitter to
> automatically infer the image stream format from the connected
> frontend (HDMI or AFE).
>
> Setting a new format on the subdevice hence does not actually control
> the CSI-2 output format, but it's only there for the purpose of
> pipeline validation.
>
> However, there is currently no validation that the supplied media bus
> code is valid and supported by the device.
>
> With the introduction of enum_mbus_codes a list of supported format is
> now available, use it to validate that the supplied format is correct
> and use the default UYVY8 one if that's not the case.
>
> Signed-off-by: Jacopo Mondi <jacopo.mondi@xxxxxxxxxxxxxxxx>
> ---
> drivers/media/i2c/adv748x/adv748x-csi2.c | 24 ++++++++++++++++++++++++
> 1 file changed, 24 insertions(+)
>
> diff --git a/drivers/media/i2c/adv748x/adv748x-csi2.c b/drivers/media/i2c/adv748x/adv748x-csi2.c
> index 4fd6d3a681d5..3f22dc426d7a 100644
> --- a/drivers/media/i2c/adv748x/adv748x-csi2.c
> +++ b/drivers/media/i2c/adv748x/adv748x-csi2.c
> @@ -208,6 +208,23 @@ static int adv748x_csi2_get_format(struct v4l2_subdev *sd,
> return 0;
> }
>
> +static bool adv748x_csi2_is_fmt_supported(struct adv748x_csi2 *tx,
> + unsigned int code)
u32 code to match the data type from the format structure.
Reviewed-by: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>
> +{
> + const unsigned int *codes = is_txa(tx) ?
> + adv748x_csi2_txa_fmts :
> + adv748x_csi2_txb_fmts;
> + size_t num_fmts = is_txa(tx) ? ARRAY_SIZE(adv748x_csi2_txa_fmts)
> + : ARRAY_SIZE(adv748x_csi2_txb_fmts);
> +
> + for (unsigned int i = 0; i < num_fmts; i++) {
> + if (codes[i] == code)
> + return true;
> + }
> +
> + return false;
> +}
> +
> static int adv748x_csi2_set_format(struct v4l2_subdev *sd,
> struct v4l2_subdev_state *sd_state,
> struct v4l2_subdev_format *sdformat)
> @@ -217,6 +234,13 @@ static int adv748x_csi2_set_format(struct v4l2_subdev *sd,
> struct v4l2_mbus_framefmt *mbusformat;
> int ret = 0;
>
> + /*
> + * Make sure the format is supported, if not default it to
> + * UYVY8 as it's supported by both TXes.
> + */
> + if (!adv748x_csi2_is_fmt_supported(tx, sdformat->format.code))
> + sdformat->format.code = MEDIA_BUS_FMT_UYVY8_1X16;
> +
> mbusformat = adv748x_csi2_get_pad_format(sd, sd_state, sdformat->pad,
> sdformat->which);
> if (!mbusformat)
--
Regards,
Laurent Pinchart
