Re: [PATCH v2 09/11] media: vsp1: Add device info entries for VSPD on X5H

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

Hi Paul,

Thank you for the patch.

On Sat, Sep 19, 2026 at 02:07:06AM +0900, Paul Elder wrote:
> Add device info entries for the VSPD so that the driver can match on the
> VSPD on the X5H and handle it slightly different hardware configuration.

s/it/its/

> 
> On the X5H there are two variants, the VSPD (a) and VSPD (b). As the (b)
> version has a separate version number, add that as well.
> 
> Signed-off-by: Paul Elder <paul.elder+renesas@ideasonboard.com>
> ---
>  drivers/media/platform/renesas/vsp1/vsp1_drv.c  | 22 ++++++++++++++++++++++
>  drivers/media/platform/renesas/vsp1/vsp1_regs.h |  1 +
>  2 files changed, 23 insertions(+)
> 
> diff --git a/drivers/media/platform/renesas/vsp1/vsp1_drv.c b/drivers/media/platform/renesas/vsp1/vsp1_drv.c
> index 5597595414fe787413c7daa5a3142faa9ced8408..627771e3056617daa8e10d1fb68218435cde0a64 100644
> --- a/drivers/media/platform/renesas/vsp1/vsp1_drv.c
> +++ b/drivers/media/platform/renesas/vsp1/vsp1_drv.c
> @@ -860,6 +860,17 @@ static const struct vsp1_device_info vsp1_device_infos[] = {
>  		.uif_count = 2,
>  		.wpf_count = 2,
>  		.num_bru_inputs = 5,
> +	}, {
> +		.version = VI6_IP_VERSION_MODEL_VSPD_GEN4,
> +		.model = "VSP2-D (a)",
> +		.soc = VI6_IP_VERSION_SOC_X5H,
> +		.gen = 4,
> +		.features = VSP1_HAS_BRU | VSP1_HAS_EXT_DL,
> +		.lif_count = 1,
> +		.rpf_count = 5,
> +		.uif_count = 2,

This is not quite correct, this VSP has 8 UIFs (from UIF0 to UIF7).
However, not only does the driver support at most two UIFs, it hardcodes
usage of one UIF per LIF, and starts at UIF4. Declaring two UIFs here is
fine for the time being, but a comment would be nice.

		/* TODO: The VSP has 8 UIFs, while the driver only support 2. */
		.uif_count = 2,

> +		.wpf_count = 1,
> +		.num_bru_inputs = 5,
>  	}, {
>  		.version = VI6_IP_VERSION_MODEL_VSPD_GEN4,
>  		.model = "VSP2-D",
> @@ -870,6 +881,17 @@ static const struct vsp1_device_info vsp1_device_infos[] = {
>  		.uif_count = 2,
>  		.wpf_count = 1,
>  		.num_bru_inputs = 5,
> +	}, {
> +		.version = VI6_IP_VERSION_MODEL_VSPDB_GEN4,

I think that should be VI6_IP_VERSION_MODEL_VSPDB_GEN5.

> +		.model = "VSP2-D (b)",
> +		.soc = VI6_IP_VERSION_SOC_X5H,

And you can drop the soc match for now, no other SoC uses the version
model ID 0x20.

With those small issues addressed,

Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>

> +		.gen = 4,
> +		.features = VSP1_HAS_BRU | VSP1_HAS_EXT_DL,
> +		.lif_count = 1,
> +		.rpf_count = 5,
> +		.uif_count = 1,
> +		.wpf_count = 1,
> +		.num_bru_inputs = 5,
>  	}, {
>  		.version = VI6_IP_VERSION_MODEL_VSPX_GEN4,
>  		.model = "VSP2-X",
> diff --git a/drivers/media/platform/renesas/vsp1/vsp1_regs.h b/drivers/media/platform/renesas/vsp1/vsp1_regs.h
> index 8abf39bac6c2f333696ebf55de87586d2df3bed0..489d88107d1c17530a74736c40563a93cc17e567 100644
> --- a/drivers/media/platform/renesas/vsp1/vsp1_regs.h
> +++ b/drivers/media/platform/renesas/vsp1/vsp1_regs.h
> @@ -800,6 +800,7 @@
>  #define VI6_IP_VERSION_MODEL_VSPBS_GEN3	(0x1a << 8)
>  #define VI6_IP_VERSION_MODEL_VSPD_GEN4	(0x1c << 8)
>  #define VI6_IP_VERSION_MODEL_VSPX_GEN4	(0x1d << 8)
> +#define VI6_IP_VERSION_MODEL_VSPDB_GEN4	(0x20 << 8)
>  /* RZ/G2L SoCs have no version register, So use 0x80 as the model version */
>  #define VI6_IP_VERSION_MODEL_VSPD_RZG2L	(0x80 << 8)

-- 
Regards,

Laurent Pinchart