Hi Laurent
On Tue, Aug 22, 2023 at 01:29:51AM +0300, Laurent Pinchart wrote:
> Configure the crop-related registers from the values stored in the
> active crop rectangle instead of the mode structure. This removes usage
> of the mode from the imx219_set_framefmt(). No functional change is
> intended.
>
> Signed-off-by: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>
> ---
> drivers/media/i2c/imx219.c | 18 +++++++++---------
> 1 file changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/media/i2c/imx219.c b/drivers/media/i2c/imx219.c
> index 16776a3ae84d..1205986ce47e 100644
> --- a/drivers/media/i2c/imx219.c
> +++ b/drivers/media/i2c/imx219.c
> @@ -615,9 +615,9 @@ static int imx219_set_pad_format(struct v4l2_subdev *sd,
> }
>
> static int imx219_set_framefmt(struct imx219 *imx219,
> - const struct v4l2_mbus_framefmt *format)
> + const struct v4l2_mbus_framefmt *format,
> + const struct v4l2_rect *crop)
> {
> - const struct imx219_mode *mode = imx219->mode;
> unsigned int bpp;
> u16 bin_mode;
> int ret = 0;
> @@ -640,15 +640,13 @@ static int imx219_set_framefmt(struct imx219 *imx219,
> }
>
> cci_write(imx219->regmap, IMX219_REG_X_ADD_STA_A,
> - mode->crop.left - IMX219_PIXEL_ARRAY_LEFT, &ret);
> + crop->left - IMX219_PIXEL_ARRAY_LEFT, &ret);
> cci_write(imx219->regmap, IMX219_REG_X_ADD_END_A,
> - mode->crop.left - IMX219_PIXEL_ARRAY_LEFT + mode->crop.width - 1,
> - &ret);
> + crop->left - IMX219_PIXEL_ARRAY_LEFT + crop->width - 1, &ret);
> cci_write(imx219->regmap, IMX219_REG_Y_ADD_STA_A,
> - mode->crop.top - IMX219_PIXEL_ARRAY_TOP, &ret);
> + crop->top - IMX219_PIXEL_ARRAY_TOP, &ret);
> cci_write(imx219->regmap, IMX219_REG_Y_ADD_END_A,
> - mode->crop.top - IMX219_PIXEL_ARRAY_TOP + mode->crop.height - 1,
> - &ret);
> + crop->top - IMX219_PIXEL_ARRAY_TOP + crop->height - 1, &ret);
>
> if (!imx219->mode->binning)
> bin_mode = IMX219_BINNING_NONE;
> @@ -719,6 +717,7 @@ static int imx219_start_streaming(struct imx219 *imx219,
> {
> struct i2c_client *client = v4l2_get_subdevdata(&imx219->sd);
> const struct v4l2_mbus_framefmt *format;
> + const struct v4l2_rect *crop;
> int ret;
>
> ret = pm_runtime_resume_and_get(&client->dev);
> @@ -742,7 +741,8 @@ static int imx219_start_streaming(struct imx219 *imx219,
>
> /* Apply format and crop settings. */
> format = v4l2_subdev_get_pad_format(&imx219->sd, state, 0);
> - ret = imx219_set_framefmt(imx219, format);
> + crop = v4l2_subdev_get_pad_crop(&imx219->sd, state, 0);
> + ret = imx219_set_framefmt(imx219, format, crop);
Nit:
If I'm not mistaken (I've not been able to apply the series yet)
'format' and 'crop' are now only used to be passed to
imx219_set_framefmt(). You could pass the state to
imx219_set_framefmt().
Apart from that
Reviewed-by: Jacopo Mondi <jacopo.mondi@xxxxxxxxxxxxxxxx>
> if (ret) {
> dev_err(&client->dev, "%s failed to set frame format: %d\n",
> __func__, ret);
> --
> Regards,
>
> Laurent Pinchart
>
