8f9e91ad03
These patches were generated from: https://github.com/raspberrypi/linux/commits/rpi-6.12.y With the following command: git format-patch -N v6.12.27..HEAD (HEAD -> 8d3206ee456a5ecdf9ddbfd8e5e231e4f0cd716e) Exceptions: - (def)configs patches - github workflows patches - applied & reverted patches - readme patches - wireless patches Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
126 lines
4 KiB
Diff
126 lines
4 KiB
Diff
From 9c964a07074de101d37a10cb064dedfa9d393582 Mon Sep 17 00:00:00 2001
|
|
From: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|
Date: Mon, 9 Sep 2024 16:41:12 +0100
|
|
Subject: [PATCH] media: i2c: ov5647: Add control of V4L2_CID_HBLANK
|
|
|
|
The driver did expose V4L2_CID_HBLANK, but as a READ_ONLY control.
|
|
|
|
The sensor only uses the HTS register to control the line length,
|
|
so convert this control to read/write, with the appropriate ranges.
|
|
Adopt the old fixed values as the minimum values permitted in each
|
|
mode to avoid issues of it not streaming.
|
|
|
|
This should allow exposure times up to ~3 seconds (up from ~1sec).
|
|
|
|
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|
---
|
|
drivers/media/i2c/ov5647.c | 26 +++++++++++++-------------
|
|
1 file changed, 13 insertions(+), 13 deletions(-)
|
|
|
|
--- a/drivers/media/i2c/ov5647.c
|
|
+++ b/drivers/media/i2c/ov5647.c
|
|
@@ -53,6 +53,8 @@
|
|
#define OV5647_REG_AEC_AGC 0x3503
|
|
#define OV5647_REG_GAIN_HI 0x350a
|
|
#define OV5647_REG_GAIN_LO 0x350b
|
|
+#define OV5647_REG_HTS_HI 0x380c
|
|
+#define OV5647_REG_HTS_LO 0x380d
|
|
#define OV5647_REG_VTS_HI 0x380e
|
|
#define OV5647_REG_VTS_LO 0x380f
|
|
#define OV5647_REG_VFLIP 0x3820
|
|
@@ -79,6 +81,8 @@
|
|
#define OV5647_VBLANK_MIN 24
|
|
#define OV5647_VTS_MAX 32767
|
|
|
|
+#define OV5647_HTS_MAX 0x1fff
|
|
+
|
|
#define OV5647_EXPOSURE_MIN 4
|
|
#define OV5647_EXPOSURE_STEP 1
|
|
#define OV5647_EXPOSURE_DEFAULT 1000
|
|
@@ -187,8 +191,6 @@ static struct regval_list ov5647_2592x19
|
|
{0x3a19, 0xf8},
|
|
{0x3c01, 0x80},
|
|
{0x3b07, 0x0c},
|
|
- {0x380c, 0x0b},
|
|
- {0x380d, 0x1c},
|
|
{0x3814, 0x11},
|
|
{0x3815, 0x11},
|
|
{0x3708, 0x64},
|
|
@@ -276,8 +278,6 @@ static struct regval_list ov5647_1080p30
|
|
{0x3a19, 0xf8},
|
|
{0x3c01, 0x80},
|
|
{0x3b07, 0x0c},
|
|
- {0x380c, 0x09},
|
|
- {0x380d, 0x70},
|
|
{0x3814, 0x11},
|
|
{0x3815, 0x11},
|
|
{0x3708, 0x64},
|
|
@@ -375,8 +375,6 @@ static struct regval_list ov5647_2x2binn
|
|
{0x3809, 0x10},
|
|
{0x380a, 0x03},
|
|
{0x380b, 0xcc},
|
|
- {0x380c, 0x07},
|
|
- {0x380d, 0x68},
|
|
{0x3811, 0x0c},
|
|
{0x3813, 0x06},
|
|
{0x3814, 0x31},
|
|
@@ -450,8 +448,6 @@ static struct regval_list ov5647_640x480
|
|
{0x3a19, 0xf8},
|
|
{0x3c01, 0x80},
|
|
{0x3b07, 0x0c},
|
|
- {0x380c, 0x07},
|
|
- {0x380d, 0x3c},
|
|
{0x3814, 0x35},
|
|
{0x3815, 0x35},
|
|
{0x3708, 0x64},
|
|
@@ -1073,7 +1069,8 @@ static int ov5647_set_pad_fmt(struct v4l
|
|
mode->pixel_rate, 1, mode->pixel_rate);
|
|
|
|
hblank = mode->hts - mode->format.width;
|
|
- __v4l2_ctrl_modify_range(sensor->hblank, hblank, hblank, 1,
|
|
+ __v4l2_ctrl_modify_range(sensor->hblank, hblank,
|
|
+ OV5647_HTS_MAX - mode->format.width, 1,
|
|
hblank);
|
|
|
|
vblank = mode->vts - mode->format.height;
|
|
@@ -1337,6 +1334,10 @@ static int ov5647_s_ctrl(struct v4l2_ctr
|
|
ret = ov5647_write16(sd, OV5647_REG_VTS_HI,
|
|
sensor->mode->format.height + ctrl->val);
|
|
break;
|
|
+ case V4L2_CID_HBLANK:
|
|
+ ret = ov5647_write16(sd, OV5647_REG_HTS_HI,
|
|
+ sensor->mode->format.width + ctrl->val);
|
|
+ break;
|
|
case V4L2_CID_TEST_PATTERN:
|
|
ret = ov5647_write(sd, OV5647_REG_ISPCTRL3D,
|
|
ov5647_test_pattern_val[ctrl->val]);
|
|
@@ -1344,7 +1345,6 @@ static int ov5647_s_ctrl(struct v4l2_ctr
|
|
|
|
/* Read-only, but we adjust it based on mode. */
|
|
case V4L2_CID_PIXEL_RATE:
|
|
- case V4L2_CID_HBLANK:
|
|
/* Read-only, but we adjust it based on mode. */
|
|
break;
|
|
|
|
@@ -1421,10 +1421,11 @@ static int ov5647_init_controls(struct o
|
|
sensor->mode->pixel_rate, 1,
|
|
sensor->mode->pixel_rate);
|
|
|
|
- /* By default, HBLANK is read only, but it does change per mode. */
|
|
hblank = sensor->mode->hts - sensor->mode->format.width;
|
|
sensor->hblank = v4l2_ctrl_new_std(&sensor->ctrls, &ov5647_ctrl_ops,
|
|
- V4L2_CID_HBLANK, hblank, hblank, 1,
|
|
+ V4L2_CID_HBLANK, hblank,
|
|
+ OV5647_HTS_MAX -
|
|
+ sensor->mode->format.width, 1,
|
|
hblank);
|
|
|
|
sensor->vblank = v4l2_ctrl_new_std(&sensor->ctrls, &ov5647_ctrl_ops,
|
|
@@ -1458,7 +1459,6 @@ static int ov5647_init_controls(struct o
|
|
goto handler_free;
|
|
|
|
sensor->pixel_rate->flags |= V4L2_CTRL_FLAG_READ_ONLY;
|
|
- sensor->hblank->flags |= V4L2_CTRL_FLAG_READ_ONLY;
|
|
sensor->sd.ctrl_handler = &sensor->ctrls;
|
|
|
|
return 0;
|