On Fri, Oct 18, 2024 at 12:45:36PM +0100, Lad, Prabhakar wrote:
> On Tue, Oct 15, 2024 at 11:33 AM Laurent Pinchart wrote:
> > On Fri, Oct 11, 2024 at 06:30:45PM +0100, Prabhakar wrote:
> > > From: Lad Prabhakar <prabhakar.mahadev-lad.rj@xxxxxxxxxxxxxx>
> > >
> > > Make use of v4l2_format_info() helpers to determine the input and
> > > output formats.
> > >
> > > Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@xxxxxxxxxxxxxx>
> > > ---
> > > .../platform/renesas/rzg2l-cru/rzg2l-video.c | 22 ++++++-------------
> > > 1 file changed, 7 insertions(+), 15 deletions(-)
> > >
> > > diff --git a/drivers/media/platform/renesas/rzg2l-cru/rzg2l-video.c b/drivers/media/platform/renesas/rzg2l-cru/rzg2l-video.c
> > > index 8932fab7c656..0cc69a7440bf 100644
> > > --- a/drivers/media/platform/renesas/rzg2l-cru/rzg2l-video.c
> > > +++ b/drivers/media/platform/renesas/rzg2l-cru/rzg2l-video.c
> > > @@ -300,21 +300,12 @@ static void rzg2l_cru_initialize_axi(struct rzg2l_cru_dev *cru)
> > > rzg2l_cru_write(cru, AMnAXIATTR, amnaxiattr);
> > > }
> > >
> > > -static void rzg2l_cru_csi2_setup(struct rzg2l_cru_dev *cru, bool *input_is_yuv,
> > > +static void rzg2l_cru_csi2_setup(struct rzg2l_cru_dev *cru,
> > > const struct rzg2l_cru_ip_format *ip_fmt,
> > > u8 csi_vc)
> > > {
> > > u32 icnmc = ICnMC_INF(ip_fmt->datatype);
> > >
> > > - switch (ip_fmt->code) {
> > > - case MEDIA_BUS_FMT_UYVY8_1X16:
> > > - *input_is_yuv = true;
> > > - break;
> > > - default:
> > > - *input_is_yuv = false;
> > > - break;
> > > - }
> > > -
> > > icnmc |= (rzg2l_cru_read(cru, ICnMC) & ~ICnMC_INF_MASK);
> > >
> > > /* Set virtual channel CSI2 */
> > > @@ -327,19 +318,17 @@ static int rzg2l_cru_initialize_image_conv(struct rzg2l_cru_dev *cru,
> > > struct v4l2_mbus_framefmt *ip_sd_fmt,
> > > u8 csi_vc)
> > > {
> > > + const struct v4l2_format_info *src_finfo, *dst_finfo;
> > > const struct rzg2l_cru_ip_format *cru_ip_fmt;
> > > - bool output_is_yuv = false;
> > > - bool input_is_yuv = false;
> > > u32 icndmr;
> > >
> > > cru_ip_fmt = rzg2l_cru_ip_code_to_fmt(ip_sd_fmt->code);
> > > - rzg2l_cru_csi2_setup(cru, &input_is_yuv, cru_ip_fmt, csi_vc);
> > > + rzg2l_cru_csi2_setup(cru, cru_ip_fmt, csi_vc);
> > >
> > > /* Output format */
> > > switch (cru->format.pixelformat) {
> > > case V4L2_PIX_FMT_UYVY:
> > > icndmr = ICnDMR_YCMODE_UYVY;
> > > - output_is_yuv = true;
> > > break;
> > > default:
> > > dev_err(cru->dev, "Invalid pixelformat (0x%x)\n",
> > > @@ -347,8 +336,11 @@ static int rzg2l_cru_initialize_image_conv(struct rzg2l_cru_dev *cru,
> > > return -EINVAL;
> > > }
> > >
> > > + src_finfo = v4l2_format_info(cru_ip_fmt->format);
> > > + dst_finfo = v4l2_format_info(cru->format.pixelformat);
> >
> > It would be a bit more efficient to add a yuv boolean field to the
> > rzg2l_cru_ip_format structure, as you already have looked up cru_ip_fmt
> > for the IP subdev format.
>
> I will consider this change, when adding support for the RZ/V2H SoC,
> hope that's OK for you.
It's not a blocker, it can be done on top indeed. If you end up
submitting a v6 you could add a patch on top already, but otherwise
later is fine too.
> > Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@xxxxxxxxxxxxxxxx>
> >
> > > +
> > > /* If input and output use same colorspace, do bypass mode */
> > > - if (output_is_yuv == input_is_yuv)
> > > + if (v4l2_is_format_yuv(src_finfo) == v4l2_is_format_yuv(dst_finfo))
> > > rzg2l_cru_write(cru, ICnMC,
> > > rzg2l_cru_read(cru, ICnMC) | ICnMC_CSCTHR);
> > > else
--
Regards,
Laurent Pinchart
