Re: [PATCH v3 12/15] media: mt9m114: Don't allow changing the IFP crop/compose selections when bypassing the scaler

[Laurent Pinchart <laurent.pinchart@ideasonboard.com>]

Hi Hans,

Thank you for the patch.

On Sun, Jun 29, 2025 at 10:56:22PM +0200, Hans de Goede wrote:
> The scaler is bypassed when the ISP source/output pad's pixel-format is
> set to MEDIA_BUS_FMT_SGRBG10_1X10. Don't allow changing the IFP crop and/or
> compose selections when in this mode.
> 
> Instead of returning -EINVAL simply return the current (noop) crop and
> compose rectangles.
> 
> Signed-off-by: Hans de Goede <hansg@kernel.org>
> ---
> Changes in v3:
> - This is a new patch in v3 of this patch-set, which comes from splitting
>   up "media: mt9m114: Fix scaler bypass mode" into multiple patches
> - Add src_format local variable
> ---
>  drivers/media/i2c/mt9m114.c | 14 ++++++++++----
>  1 file changed, 10 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/media/i2c/mt9m114.c b/drivers/media/i2c/mt9m114.c
> index 1f305bba180e..1280d90cd411 100644
> --- a/drivers/media/i2c/mt9m114.c
> +++ b/drivers/media/i2c/mt9m114.c
> @@ -1963,7 +1963,7 @@ static int mt9m114_ifp_set_selection(struct v4l2_subdev *sd,
>  				     struct v4l2_subdev_state *state,
>  				     struct v4l2_subdev_selection *sel)
>  {
> -	struct v4l2_mbus_framefmt *format;
> +	struct v4l2_mbus_framefmt *format, *src_format;
>  	struct v4l2_rect *crop;
>  	struct v4l2_rect *compose;
>  	unsigned int border;
> @@ -1976,6 +1976,13 @@ static int mt9m114_ifp_set_selection(struct v4l2_subdev *sd,
>  	if (sel->pad != 0)
>  		return -EINVAL;
>  
> +	/* Crop and compose cannot be changed when bypassing the scaler. */
> +	src_format = v4l2_subdev_state_get_format(state, 1);
> +	if (src_format->code == MEDIA_BUS_FMT_SGRBG10_1X10) {
> +		sel->r = *v4l2_subdev_state_get_crop(state, 0);

You can move the 

 	crop = v4l2_subdev_state_get_crop(state, 0);

line from below above the if statement, and use

		sel->r = *crop;

here.

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

> +		return 0;
> +	}
> +
>  	format = v4l2_subdev_state_get_format(state, 0);
>  	crop = v4l2_subdev_state_get_crop(state, 0);
>  	compose = v4l2_subdev_state_get_compose(state, 0);
> @@ -2022,9 +2029,8 @@ static int mt9m114_ifp_set_selection(struct v4l2_subdev *sd,
>  	}
>  
>  	/* Propagate the compose rectangle to the source format. */
> -	format = v4l2_subdev_state_get_format(state, 1);
> -	format->width = compose->width;
> -	format->height = compose->height;
> +	src_format->width = compose->width;
> +	src_format->height = compose->height;
>  
>  	return 0;
>  }

-- 
Regards,

Laurent Pinchart