[PATCH] media: ov5640: Fix set format, v4l2_mbus_pixelcode not updated

[PATCH] media: ov5640: Fix set format, v4l2_mbus_pixelcode not updated

[Mirela Rabulea (OSS)]

From: Mirela Rabulea <mirela.rabulea@nxp.com>

In ov5640_set_fmt, pending_fmt_change will always be false, because the
sensor format is saved before comparing it with the previous format:
	fmt = &sensor->fmt;...
	*fmt = *mbus_fmt;...
	if (mbus_fmt->code != sensor->fmt.code)
		sensor->pending_fmt_change = true;
This causes the sensor to capture with the previous pixelcode.

Also, changes might happen even for V4L2_SUBDEV_FORMAT_TRY, so fix that.

Basically, revert back to the state before
commit 071154499193 ("media: ov5640: Fix set format regression")
as it was more clear, and then update format even when pixelcode does
not change, as resolution might change.

Fixes: 071154499193 ("media: ov5640: Fix set format regression")
Fixes: 6949d864776e ("media: ov5640: do not change mode if format or frame interval is unchanged")
Fixes: fb98e29ff1ea5 ("media: ov5640: fix mode change regression")

Signed-off-by: Mirela Rabulea <mirela.rabulea@nxp.com>
---
 drivers/media/i2c/ov5640.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/media/i2c/ov5640.c b/drivers/media/i2c/ov5640.c
index ddbd71394db3..db5a19babe67 100644
--- a/drivers/media/i2c/ov5640.c
+++ b/drivers/media/i2c/ov5640.c
@@ -2293,7 +2293,6 @@ static int ov5640_set_fmt(struct v4l2_subdev *sd,
 	struct ov5640_dev *sensor = to_ov5640_dev(sd);
 	const struct ov5640_mode_info *new_mode;
 	struct v4l2_mbus_framefmt *mbus_fmt = &format->format;
-	struct v4l2_mbus_framefmt *fmt;
 	int ret;
 
 	if (format->pad != 0)
@@ -2311,12 +2310,10 @@ static int ov5640_set_fmt(struct v4l2_subdev *sd,
 	if (ret)
 		goto out;
 
-	if (format->which == V4L2_SUBDEV_FORMAT_TRY)
-		fmt = v4l2_subdev_get_try_format(sd, sd_state, 0);
-	else
-		fmt = &sensor->fmt;
-
-	*fmt = *mbus_fmt;
+	if (format->which == V4L2_SUBDEV_FORMAT_TRY) {
+		*v4l2_subdev_get_try_format(sd, sd_state, 0) = *mbus_fmt;
+		goto out;
+	}
 
 	if (new_mode != sensor->current_mode) {
 		sensor->current_mode = new_mode;
@@ -2325,6 +2322,9 @@ static int ov5640_set_fmt(struct v4l2_subdev *sd,
 	if (mbus_fmt->code != sensor->fmt.code)
 		sensor->pending_fmt_change = true;
 
+	/* update format even if code is unchanged, resolution might change */
+	sensor->fmt = *mbus_fmt;
+
 	__v4l2_ctrl_s_ctrl_int64(sensor->ctrls.pixel_rate,
 				 ov5640_calc_pixel_rate(sensor));
 out:
-- 
2.25.1

Re: [PATCH] media: ov5640: Fix set format, v4l2_mbus_pixelcode not updated

[Hugues FRUCHET - FOSS]

Hi Mirela,

Thanks for patch, tested OK on my side:

Acked-by: Hugues Fruchet <hugues.fruchet@st.com>
Tested-by: Hugues Fruchet <hugues.fruchet@st.com>

BR,
Hugues.
> 
> 
> -----Original Message-----
> From: Mirela Rabulea (OSS) <mirela.rabulea@oss.nxp.com>
> Sent: lundi 1 novembre 2021 20:53
> To: slongerbeam@gmail.com; mchehab@kernel.org; Hugues FRUCHET <hugues.fruchet@st.com>; jacopo+renesas@jmondi.org
> Cc: guoniu.zhou@nxp.com; manish.bajaj@nxp.com; robert.chiras@nxp.com; xavier.roumegue@oss.nxp.com; linux-media@vger.kernel.org; linux-kernel@vger.kernel.org; linux-imx@nxp.com; Mirela Rabulea <mirela.rabulea@nxp.com>
> Subject: [PATCH] media: ov5640: Fix set format, v4l2_mbus_pixelcode not updated
> 
> From: Mirela Rabulea <mirela.rabulea@nxp.com>
> 
> In ov5640_set_fmt, pending_fmt_change will always be false, because the sensor format is saved before comparing it with the previous format:
> 	fmt = &sensor->fmt;...
> 	*fmt = *mbus_fmt;...
> 	if (mbus_fmt->code != sensor->fmt.code)
> 		sensor->pending_fmt_change = true;
> This causes the sensor to capture with the previous pixelcode.
> 
> Also, changes might happen even for V4L2_SUBDEV_FORMAT_TRY, so fix that.
> 
> Basically, revert back to the state before commit 071154499193 ("media: ov5640: Fix set format regression") as it was more clear, and then update format even when pixelcode does not change, as resolution might change.
> 
> Fixes: 071154499193 ("media: ov5640: Fix set format regression")
> Fixes: 6949d864776e ("media: ov5640: do not change mode if format or frame interval is unchanged")
> Fixes: fb98e29ff1ea5 ("media: ov5640: fix mode change regression")
> 
> Signed-off-by: Mirela Rabulea <mirela.rabulea@nxp.com>
> ---
>   drivers/media/i2c/ov5640.c | 14 +++++++-------
>   1 file changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/media/i2c/ov5640.c b/drivers/media/i2c/ov5640.c index ddbd71394db3..db5a19babe67 100644
> --- a/drivers/media/i2c/ov5640.c
> +++ b/drivers/media/i2c/ov5640.c
> @@ -2293,7 +2293,6 @@ static int ov5640_set_fmt(struct v4l2_subdev *sd,
>   	struct ov5640_dev *sensor = to_ov5640_dev(sd);
>   	const struct ov5640_mode_info *new_mode;
>   	struct v4l2_mbus_framefmt *mbus_fmt = &format->format;
> -	struct v4l2_mbus_framefmt *fmt;
>   	int ret;
>   
>   	if (format->pad != 0)
> @@ -2311,12 +2310,10 @@ static int ov5640_set_fmt(struct v4l2_subdev *sd,
>   	if (ret)
>   		goto out;
>   
> -	if (format->which == V4L2_SUBDEV_FORMAT_TRY)
> -		fmt = v4l2_subdev_get_try_format(sd, sd_state, 0);
> -	else
> -		fmt = &sensor->fmt;
> -
> -	*fmt = *mbus_fmt;
> +	if (format->which == V4L2_SUBDEV_FORMAT_TRY) {
> +		*v4l2_subdev_get_try_format(sd, sd_state, 0) = *mbus_fmt;
> +		goto out;
> +	}
>   
>   	if (new_mode != sensor->current_mode) {
>   		sensor->current_mode = new_mode;
> @@ -2325,6 +2322,9 @@ static int ov5640_set_fmt(struct v4l2_subdev *sd,
>   	if (mbus_fmt->code != sensor->fmt.code)
>   		sensor->pending_fmt_change = true;
>   
> +	/* update format even if code is unchanged, resolution might change */
> +	sensor->fmt = *mbus_fmt;
> +
>   	__v4l2_ctrl_s_ctrl_int64(sensor->ctrls.pixel_rate,
>   				 ov5640_calc_pixel_rate(sensor));
>   out:
> --
> 2.25.1
> 

Re: [EXT] Re: [PATCH] media: ov5640: Fix set format, v4l2_mbus_pixelcode not updated

[Mirela Rabulea]

Hi Hugues,

On Tue, 2021-11-09 at 15:19 +0100, Hugues FRUCHET - FOSS wrote:
> 
> Hi Mirela,
> 
> Thanks for patch, tested OK on my side:

Thanks, for testing!

Regards,
Mirela

> 
> Acked-by: Hugues Fruchet <hugues.fruchet@st.com>
> Tested-by: Hugues Fruchet <hugues.fruchet@st.com>
> 
> BR,
> Hugues.
> > 
> > -----Original Message-----
> > From: Mirela Rabulea (OSS) <mirela.rabulea@oss.nxp.com>
> > Sent: lundi 1 novembre 2021 20:53
> > To: slongerbeam@gmail.com; mchehab@kernel.org; Hugues FRUCHET <
> > hugues.fruchet@st.com>; jacopo+renesas@jmondi.org
> > Cc: guoniu.zhou@nxp.com; manish.bajaj@nxp.com; 
> > robert.chiras@nxp.com; xavier.roumegue@oss.nxp.com; 
> > linux-media@vger.kernel.org; linux-kernel@vger.kernel.org; 
> > linux-imx@nxp.com; Mirela Rabulea <mirela.rabulea@nxp.com>
> > Subject: [PATCH] media: ov5640: Fix set format, v4l2_mbus_pixelcode
> > not updated
> > 
> > From: Mirela Rabulea <mirela.rabulea@nxp.com>
> > 
> > In ov5640_set_fmt, pending_fmt_change will always be false, because
> > the sensor format is saved before comparing it with the previous
> > format:
> >       fmt = &sensor->fmt;...
> >       *fmt = *mbus_fmt;...
> >       if (mbus_fmt->code != sensor->fmt.code)
> >               sensor->pending_fmt_change = true;
> > This causes the sensor to capture with the previous pixelcode.
> > 
> > Also, changes might happen even for V4L2_SUBDEV_FORMAT_TRY, so fix
> > that.
> > 
> > Basically, revert back to the state before commit 071154499193
> > ("media: ov5640: Fix set format regression") as it was more clear,
> > and then update format even when pixelcode does not change, as
> > resolution might change.
> > 
> > Fixes: 071154499193 ("media: ov5640: Fix set format regression")
> > Fixes: 6949d864776e ("media: ov5640: do not change mode if format
> > or frame interval is unchanged")
> > Fixes: fb98e29ff1ea5 ("media: ov5640: fix mode change regression")
> > 
> > Signed-off-by: Mirela Rabulea <mirela.rabulea@nxp.com>
> > ---
> >   drivers/media/i2c/ov5640.c | 14 +++++++-------
> >   1 file changed, 7 insertions(+), 7 deletions(-)
> > 
> > diff --git a/drivers/media/i2c/ov5640.c
> > b/drivers/media/i2c/ov5640.c index ddbd71394db3..db5a19babe67
> > 100644
> > --- a/drivers/media/i2c/ov5640.c
> > +++ b/drivers/media/i2c/ov5640.c
> > @@ -2293,7 +2293,6 @@ static int ov5640_set_fmt(struct v4l2_subdev
> > *sd,
> >       struct ov5640_dev *sensor = to_ov5640_dev(sd);
> >       const struct ov5640_mode_info *new_mode;
> >       struct v4l2_mbus_framefmt *mbus_fmt = &format->format;
> > -     struct v4l2_mbus_framefmt *fmt;
> >       int ret;
> > 
> >       if (format->pad != 0)
> > @@ -2311,12 +2310,10 @@ static int ov5640_set_fmt(struct
> > v4l2_subdev *sd,
> >       if (ret)
> >               goto out;
> > 
> > -     if (format->which == V4L2_SUBDEV_FORMAT_TRY)
> > -             fmt = v4l2_subdev_get_try_format(sd, sd_state, 0);
> > -     else
> > -             fmt = &sensor->fmt;
> > -
> > -     *fmt = *mbus_fmt;
> > +     if (format->which == V4L2_SUBDEV_FORMAT_TRY) {
> > +             *v4l2_subdev_get_try_format(sd, sd_state, 0) =
> > *mbus_fmt;
> > +             goto out;
> > +     }
> > 
> >       if (new_mode != sensor->current_mode) {
> >               sensor->current_mode = new_mode;
> > @@ -2325,6 +2322,9 @@ static int ov5640_set_fmt(struct v4l2_subdev
> > *sd,
> >       if (mbus_fmt->code != sensor->fmt.code)
> >               sensor->pending_fmt_change = true;
> > 
> > +     /* update format even if code is unchanged, resolution might
> > change */
> > +     sensor->fmt = *mbus_fmt;
> > +
> >       __v4l2_ctrl_s_ctrl_int64(sensor->ctrls.pixel_rate,
> >                                ov5640_calc_pixel_rate(sensor));
> >   out:
> > --
> > 2.25.1
> > 

Re: [PATCH] media: ov5640: Fix set format, v4l2_mbus_pixelcode not updated

[Jacopo Mondi]

Hi Mirela,

On Mon, Nov 01, 2021 at 09:52:51PM +0200, Mirela Rabulea (OSS) wrote:
> From: Mirela Rabulea <mirela.rabulea@nxp.com>
>
> In ov5640_set_fmt, pending_fmt_change will always be false, because the
> sensor format is saved before comparing it with the previous format:
> 	fmt = &sensor->fmt;...
> 	*fmt = *mbus_fmt;...
> 	if (mbus_fmt->code != sensor->fmt.code)
> 		sensor->pending_fmt_change = true;
> This causes the sensor to capture with the previous pixelcode.
>
> Also, changes might happen even for V4L2_SUBDEV_FORMAT_TRY, so fix that.
>
> Basically, revert back to the state before
> commit 071154499193 ("media: ov5640: Fix set format regression")
> as it was more clear, and then update format even when pixelcode does
> not change, as resolution might change.
>
> Fixes: 071154499193 ("media: ov5640: Fix set format regression")
> Fixes: 6949d864776e ("media: ov5640: do not change mode if format or frame interval is unchanged")
> Fixes: fb98e29ff1ea5 ("media: ov5640: fix mode change regression")

Wow, we really piled bug over bug. So sorry about this and thanks for
fixing

Reviewed-by: Jacopo Mondi <jacopo+renesas@jmondi.org>

Thanks
   j
>
> Signed-off-by: Mirela Rabulea <mirela.rabulea@nxp.com>
> ---
>  drivers/media/i2c/ov5640.c | 14 +++++++-------
>  1 file changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/media/i2c/ov5640.c b/drivers/media/i2c/ov5640.c
> index ddbd71394db3..db5a19babe67 100644
> --- a/drivers/media/i2c/ov5640.c
> +++ b/drivers/media/i2c/ov5640.c
> @@ -2293,7 +2293,6 @@ static int ov5640_set_fmt(struct v4l2_subdev *sd,
>  	struct ov5640_dev *sensor = to_ov5640_dev(sd);
>  	const struct ov5640_mode_info *new_mode;
>  	struct v4l2_mbus_framefmt *mbus_fmt = &format->format;
> -	struct v4l2_mbus_framefmt *fmt;
>  	int ret;
>
>  	if (format->pad != 0)
> @@ -2311,12 +2310,10 @@ static int ov5640_set_fmt(struct v4l2_subdev *sd,
>  	if (ret)
>  		goto out;
>
> -	if (format->which == V4L2_SUBDEV_FORMAT_TRY)
> -		fmt = v4l2_subdev_get_try_format(sd, sd_state, 0);
> -	else
> -		fmt = &sensor->fmt;
> -
> -	*fmt = *mbus_fmt;
> +	if (format->which == V4L2_SUBDEV_FORMAT_TRY) {
> +		*v4l2_subdev_get_try_format(sd, sd_state, 0) = *mbus_fmt;
> +		goto out;
> +	}
>
>  	if (new_mode != sensor->current_mode) {
>  		sensor->current_mode = new_mode;
> @@ -2325,6 +2322,9 @@ static int ov5640_set_fmt(struct v4l2_subdev *sd,
>  	if (mbus_fmt->code != sensor->fmt.code)
>  		sensor->pending_fmt_change = true;
>
> +	/* update format even if code is unchanged, resolution might change */
> +	sensor->fmt = *mbus_fmt;
> +
>  	__v4l2_ctrl_s_ctrl_int64(sensor->ctrls.pixel_rate,
>  				 ov5640_calc_pixel_rate(sensor));
>  out:
> --
> 2.25.1
>