mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-20 06:08:08 +00:00
8c405cdccc
The patches were generated from the RPi repo with the following command: git format-patch v6.6.34..rpi-6.1.y Some patches needed rebasing and, as usual, the applied and reverted, wireless drivers, Github workflows, READMEs and defconfigs patches were removed. Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
64 lines
2.2 KiB
Diff
64 lines
2.2 KiB
Diff
From 8e8e8ba6a3c05d2e01492581801f73e40e482e42 Mon Sep 17 00:00:00 2001
|
|
From: Naushir Patuck <naush@raspberrypi.com>
|
|
Date: Wed, 31 May 2023 15:51:58 +0100
|
|
Subject: [PATCH 0473/1085] drivers: media: imx296: Disable 2x2 binned mode
|
|
|
|
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>
|
|
---
|
|
drivers/media/i2c/imx296.c | 34 +++++++---------------------------
|
|
1 file changed, 7 insertions(+), 27 deletions(-)
|
|
|
|
--- a/drivers/media/i2c/imx296.c
|
|
+++ b/drivers/media/i2c/imx296.c
|
|
@@ -674,7 +674,11 @@ static int imx296_enum_frame_size(struct
|
|
|
|
format = v4l2_subdev_get_pad_format(sd, 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);
|
|
@@ -696,32 +700,8 @@ static int imx296_set_format(struct v4l2
|
|
crop = v4l2_subdev_get_pad_crop(sd, state, fmt->pad);
|
|
format = v4l2_subdev_get_pad_format(sd, 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;
|