Re: [PATCH v5 13/17] media: rzg2l-cru: Add image_conv offset to OF data

Laurent Pinchart
2025-04-02T00:47:31Z

Hi Tommaso,

Thank you for the patch.

On Fri, Mar 28, 2025 at 06:29:49PM +0100, Tommaso Merciai wrote:
> From: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
>
> Add `image_conv` field to the `rzg2l_cru_info` structure to store the
> register offset for image conversion control. RZ/G2L uses `ICnMC`, while
> RZ/G3E and RZ/V2H(P) use `ICnIPMC_C0`.
>
> Update `rzg2l_cru_initialize_image_conv()` and `rzg2l_cru_csi2_setup()`
> to use this `image_conv` offset from the OF data, facilitating future
> support for RZ/G3E and RZ/V2H(P) SoCs.
>
> Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
> Signed-off-by: Tommaso Merciai <tommaso.merciai.xr@bp.renesas.com>
> ---
> .../media/platform/renesas/rzg2l-cru/rzg2l-core.c | 1 +
> .../media/platform/renesas/rzg2l-cru/rzg2l-cru.h | 1 +
> .../media/platform/renesas/rzg2l-cru/rzg2l-video.c | 14 ++++++++------
> 3 files changed, 10 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/media/platform/renesas/rzg2l-cru/rzg2l-core.c b/drivers/media/platform/renesas/rzg2l-cru/rzg2l-core.c
> index 19f93b7fe6fb9..7e94ae8039677 100644
> --- a/drivers/media/platform/renesas/rzg2l-cru/rzg2l-core.c
> +++ b/drivers/media/platform/renesas/rzg2l-cru/rzg2l-core.c
> @@ -357,6 +357,7 @@ static const u16 rzg2l_cru_regs[] = {
> static const struct rzg2l_cru_info rzgl2_cru_info = {
> .max_width = 2800,
> .max_height = 4095,
> + .image_conv = ICnMC,
> .regs = rzg2l_cru_regs,
> };
>
> diff --git a/drivers/media/platform/renesas/rzg2l-cru/rzg2l-cru.h b/drivers/media/platform/renesas/rzg2l-cru/rzg2l-cru.h
> index 6a621073948aa..ca156772b949b 100644
> --- a/drivers/media/platform/renesas/rzg2l-cru/rzg2l-cru.h
> +++ b/drivers/media/platform/renesas/rzg2l-cru/rzg2l-cru.h
> @@ -81,6 +81,7 @@ struct rzg2l_cru_ip_format {
> struct rzg2l_cru_info {
> unsigned int max_width;
> unsigned int max_height;
> + u16 image_conv;
> const u16 *regs;
> };
>
> diff --git a/drivers/media/platform/renesas/rzg2l-cru/rzg2l-video.c b/drivers/media/platform/renesas/rzg2l-cru/rzg2l-video.c
> index 395c4d3d0f0fa..e13f633a687b2 100644
> --- a/drivers/media/platform/renesas/rzg2l-cru/rzg2l-video.c
> +++ b/drivers/media/platform/renesas/rzg2l-cru/rzg2l-video.c
> @@ -246,20 +246,22 @@ static void rzg2l_cru_csi2_setup(struct rzg2l_cru_dev *cru,
> const struct rzg2l_cru_ip_format *ip_fmt,
> u8 csi_vc)
> {
> + const struct rzg2l_cru_info *info = cru->info;
> u32 icnmc = ICnMC_INF(ip_fmt->datatype);
>
> - icnmc |= (rzg2l_cru_read(cru, ICnMC) & ~ICnMC_INF_MASK);
> + icnmc |= (rzg2l_cru_read(cru, info->image_conv) & ~ICnMC_INF_MASK);

While at it you can drop the outer parentheses.

>
> /* Set virtual channel CSI2 */
> icnmc |= ICnMC_VCSEL(csi_vc);
>
> - rzg2l_cru_write(cru, ICnMC, icnmc);
> + rzg2l_cru_write(cru, info->image_conv, icnmc);
> }
>
> static int rzg2l_cru_initialize_image_conv(struct rzg2l_cru_dev *cru,
> struct v4l2_mbus_framefmt *ip_sd_fmt,
> u8 csi_vc)
> {
> + const struct rzg2l_cru_info *info = cru->info;
> const struct rzg2l_cru_ip_format *cru_video_fmt;
> const struct rzg2l_cru_ip_format *cru_ip_fmt;
>
> @@ -276,11 +278,11 @@ static int rzg2l_cru_initialize_image_conv(struct rzg2l_cru_dev *cru,
>
> /* If input and output use same colorspace, do bypass mode */
> if (cru_ip_fmt->yuv == cru_video_fmt->yuv)
> - rzg2l_cru_write(cru, ICnMC,
> - rzg2l_cru_read(cru, ICnMC) | ICnMC_CSCTHR);
> + rzg2l_cru_write(cru, info->image_conv,
> + rzg2l_cru_read(cru, info->image_conv) | ICnMC_CSCTHR);
> else
> - rzg2l_cru_write(cru, ICnMC,
> - rzg2l_cru_read(cru, ICnMC) & (~ICnMC_CSCTHR));
> + rzg2l_cru_write(cru, info->image_conv,
> + rzg2l_cru_read(cru, info->image_conv) & (~ICnMC_CSCTHR));

And here you can drop the parentheses around ~ICnMC_CSCTHR.

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

>
> /* Set output data format */
> rzg2l_cru_write(cru, ICnDMR, cru_video_fmt->icndmr);

--
Regards,

Laurent Pinchart