raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 01:49:46 +00:00
Code Issues Projects Releases Wiki Activity

drivers: media: imx296: Disable 2x2 binned mode

Browse Source 
Disable enumerating and setting of the 2x2 binned mode entirely as it
does not seem to work for either mono or colour sensor variants.

Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
This commit is contained in:
Naushir Patuck
2023-05-31 15:51:58 +01:00
committed by Dom Cobley
parent 4744fcf210
commit 52bc3d701f
1 changed files with 7 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
drivers/media/i2c/imx296.c
View File

@@ -663,7 +663,11 @@ static int imx296_enum_frame_size(struct v4l2_subdev *sd,
format = v4l2_subdev_state_get_format(state, fse->pad);
if (fse->index >= 2 || fse->code != format->code)
/*
* Binning does not seem to work on either mono or colour sensor
* variants. Disable enumerating the binned frame size for now.
*/
if (fse->index >= 1 || fse->code != format->code)
return -EINVAL;
fse->min_width = IMX296_PIXEL_ARRAY_WIDTH / (fse->index + 1);
@@ -685,32 +689,8 @@ static int imx296_set_format(struct v4l2_subdev *sd,
crop = v4l2_subdev_state_get_crop(state, fmt->pad);
format = v4l2_subdev_state_get_format(state, fmt->pad);
/*
* Binning is only allowed when cropping is disabled according to the
* documentation. This should be double-checked.
*/
if (crop->width == IMX296_PIXEL_ARRAY_WIDTH &&
crop->height == IMX296_PIXEL_ARRAY_HEIGHT) {
unsigned int width;
unsigned int height;
unsigned int hratio;
unsigned int vratio;
/* Clamp the width and height to avoid dividing by zero. */
width = clamp_t(unsigned int, fmt->format.width,
crop->width / 2, crop->width);
height = clamp_t(unsigned int, fmt->format.height,
crop->height / 2, crop->height);
hratio = DIV_ROUND_CLOSEST(crop->width, width);
vratio = DIV_ROUND_CLOSEST(crop->height, height);
format->width = crop->width / hratio;
format->height = crop->height / vratio;
} else {
format->width = crop->width;
format->height = crop->height;
}
format->width = crop->width;
format->height = crop->height;
format->code = sensor->mono ? MEDIA_BUS_FMT_Y10_1X10
: MEDIA_BUS_FMT_SBGGR10_1X10;