Re: [PATCH v1 03/15] media: i2c: imx290: Factor out control update code to a function

Laurent Pinchart
2022-11-23T10:23:52Z

Hi Alexander,

On Wed, Nov 23, 2022 at 08:51:24AM +0100, Alexander Stein wrote:
> Am Dienstag, 22. November 2022, 23:32:38 CET schrieb Laurent Pinchart:
> > Move the control update code to a separate function to group it with all
> > the control-related code and make imx290_set_fmt() more readable.
> >
> > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> > ---
> > drivers/media/i2c/imx290.c | 36 ++++++++++++++++--------------------
> > 1 file changed, 16 insertions(+), 20 deletions(-)
> >
> > diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c
> > index 4dbf218e7a63..eb295502d0c3 100644
> > --- a/drivers/media/i2c/imx290.c
> > +++ b/drivers/media/i2c/imx290.c
> > @@ -639,6 +639,21 @@ static const char * const imx290_test_pattern_menu[] =
> > { "000/555h Toggle Pattern",
> > };
> >
> > +static void imx290_ctrl_update(struct imx290 *imx290,
> > + const struct imx290_mode *mode)
> > +{
> > + unsigned int hblank = mode->hmax - mode->width;
> > + unsigned int vblank = IMX290_VMAX_DEFAULT - mode->height;
> > +
> > + __v4l2_ctrl_s_ctrl(imx290->link_freq,
> > + imx290_get_link_freq_index(imx290));
> > + __v4l2_ctrl_s_ctrl_int64(imx290->pixel_rate,
> > + imx290_calc_pixel_rate(imx290));
>
> I do not know the details, but I assume that imx290_ctrl_init already detects,
> using imx290->ctrls.error, if one of those controls have _not_ been created.

No, there's a bug here. It's fixed in latter patches in the series I
think, but this breaks bisection. I'll fix it.

> If so:
> Acked-by: Alexander Stein <alexander.stein@ew.tq-group.com>
>
> > +
> > + __v4l2_ctrl_modify_range(imx290->hblank, hblank, hblank, 1, hblank);
> > + __v4l2_ctrl_modify_range(imx290->vblank, vblank, vblank, 1, vblank);
> > +}
> > +
> > static int imx290_ctrl_init(struct imx290 *imx290)
> > {
> > struct v4l2_fwnode_device_properties props;
> > @@ -904,26 +919,7 @@ static int imx290_set_fmt(struct v4l2_subdev *sd,
> > imx290->current_mode = mode;
> > imx290->bpp = imx290_formats[i].bpp;
> >
> > - if (imx290->link_freq)
> > - __v4l2_ctrl_s_ctrl(imx290->link_freq,
> > - imx290_get_link_freq_index(imx290));
> > - if (imx290->pixel_rate)
> > - __v4l2_ctrl_s_ctrl_int64(imx290->pixel_rate,
> > - imx290_calc_pixel_rate(imx290));
> > -
> > - if (imx290->hblank) {
> > - unsigned int hblank = mode->hmax - mode->width;
> > -
> > - __v4l2_ctrl_modify_range(imx290->hblank, hblank, hblank,
> > - 1, hblank);
> > - }
> > -
> > - if (imx290->vblank) {
> > - unsigned int vblank = IMX290_VMAX_DEFAULT - mode->height;
> > -
> > - __v4l2_ctrl_modify_range(imx290->vblank, vblank, vblank,
> > - 1, vblank);
> > - }
> > + imx290_ctrl_update(imx290, mode);
> > }
> >
> > *format = fmt->format;