public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: git@luigi311.com
To: linux-media@vger.kernel.org
Cc: dave.stevenson@raspberrypi.com, jacopo.mondi@ideasonboard.com,
	mchehab@kernel.org, robh@kernel.org,
	krzysztof.kozlowski+dt@linaro.org, conor+dt@kernel.org,
	shawnguo@kernel.org, s.hauer@pengutronix.de,
	kernel@pengutronix.de, festevam@gmail.com,
	sakari.ailus@linux.intel.com, devicetree@vger.kernel.org,
	imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org, pavel@ucw.cz,
	phone-devel@vger.kernel.org, Luis Garcia <git@luigi311.com>
Subject: [PATCH v6 10/23] media: i2c: imx258: Follow normal V4L2 behaviours for clipping exposure
Date: Sun,  2 Jun 2024 14:13:32 -0600	[thread overview]
Message-ID: <20240602201345.328737-11-git@luigi311.com> (raw)
In-Reply-To: <20240602201345.328737-1-git@luigi311.com>

From: Dave Stevenson <dave.stevenson@raspberrypi.com>

V4L2 sensor drivers are expected to clip the supported exposure
range based on the VBLANK configured.
IMX258 wasn't doing that as register 0x350 (FRM_LENGTH_CTL)
switches it to a mode where frame length tracks coarse exposure time.

Disable this mode and clip the range for V4L2_CID_EXPOSURE appropriately
based on V4L2_CID_VBLANK.

Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
Reviewed-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
Signed-off-by: Luis Garcia <git@luigi311.com>
---
 drivers/media/i2c/imx258.c | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/drivers/media/i2c/imx258.c b/drivers/media/i2c/imx258.c
index 8f792f0e0738..ebc404b548b3 100644
--- a/drivers/media/i2c/imx258.c
+++ b/drivers/media/i2c/imx258.c
@@ -37,10 +37,11 @@
 
 /* Exposure control */
 #define IMX258_REG_EXPOSURE		0x0202
+#define IMX258_EXPOSURE_OFFSET		10
 #define IMX258_EXPOSURE_MIN		4
 #define IMX258_EXPOSURE_STEP		1
 #define IMX258_EXPOSURE_DEFAULT		0x640
-#define IMX258_EXPOSURE_MAX		65535
+#define IMX258_EXPOSURE_MAX		(IMX258_VTS_MAX - IMX258_EXPOSURE_OFFSET)
 
 /* Analog gain control */
 #define IMX258_REG_ANALOG_GAIN		0x0204
@@ -371,7 +372,7 @@ static const struct imx258_reg mode_common_regs[] = {
 	{ 0x303A, 0x00 },
 	{ 0x303B, 0x10 },
 	{ 0x300D, 0x00 },
-	{ 0x0350, 0x01 },
+	{ 0x0350, 0x00 },
 	{ 0x0204, 0x00 },
 	{ 0x0205, 0x00 },
 	{ 0x020E, 0x01 },
@@ -734,6 +735,19 @@ static int imx258_update_digital_gain(struct imx258 *imx258, u32 len, u32 val)
 	return 0;
 }
 
+static void imx258_adjust_exposure_range(struct imx258 *imx258)
+{
+	int exposure_max, exposure_def;
+
+	/* Honour the VBLANK limits when setting exposure. */
+	exposure_max = imx258->cur_mode->height + imx258->vblank->val -
+		       IMX258_EXPOSURE_OFFSET;
+	exposure_def = min(exposure_max, imx258->exposure->val);
+	__v4l2_ctrl_modify_range(imx258->exposure, imx258->exposure->minimum,
+				 exposure_max, imx258->exposure->step,
+				 exposure_def);
+}
+
 static int imx258_set_ctrl(struct v4l2_ctrl *ctrl)
 {
 	struct imx258 *imx258 =
@@ -741,6 +755,13 @@ static int imx258_set_ctrl(struct v4l2_ctrl *ctrl)
 	struct i2c_client *client = v4l2_get_subdevdata(&imx258->sd);
 	int ret = 0;
 
+	/*
+	 * The VBLANK control may change the limits of usable exposure, so check
+	 * and adjust if necessary.
+	 */
+	if (ctrl->id == V4L2_CID_VBLANK)
+		imx258_adjust_exposure_range(imx258);
+
 	/*
 	 * Applying V4L2 control value only happens
 	 * when power is up for streaming
-- 
2.44.0


  parent reply	other threads:[~2024-06-02 20:20 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-06-02 20:13 [PATCH v6 00/23] imx258 improvement series git
2024-06-02 20:13 ` [PATCH v6 01/23] media: i2c: imx258: Remove unused defines git
2024-06-02 20:13 ` [PATCH v6 02/23] media: i2c: imx258: Make image geometry meet sensor requirements git
2024-06-02 20:13 ` [PATCH v6 03/23] media: i2c: imx258: Disable digital cropping on binned modes git
2024-06-02 20:13 ` [PATCH v6 04/23] media: i2c: imx258: Remove redundant I2C writes git
2024-06-02 20:13 ` [PATCH v6 05/23] media: i2c: imx258: Add regulator control git
2024-06-02 20:13 ` [PATCH v6 06/23] media: i2c: imx258: Make V4L2_CID_VBLANK configurable git
2024-06-02 20:13 ` [PATCH v6 07/23] media: i2c: imx258: Split out common registers from the mode based ones git
2024-06-02 20:13 ` [PATCH v6 08/23] media: i2c: imx258: Add support for 24MHz clock git
2024-06-02 20:13 ` [PATCH v6 09/23] media: i2c: imx258: Add support for running on 2 CSI data lanes git
2024-06-02 20:13 ` git [this message]
2024-06-02 20:13 ` [PATCH v6 11/23] media: i2c: imx258: Add get_selection for pixel array information git
2024-06-02 20:13 ` [PATCH v6 12/23] media: i2c: imx258: Allow configuration of clock lane behaviour git
2024-06-02 20:13 ` [PATCH v6 13/23] media: i2c: imx258: Correct max FRM_LENGTH_LINES value git
2024-06-02 20:13 ` [PATCH v6 14/23] media: i2c: imx258: Issue reset before starting streaming git
2024-06-02 20:13 ` [PATCH v6 15/23] media: i2c: imx258: Set pixel_rate range to the same as the value git
2024-06-02 20:13 ` [PATCH v6 16/23] media: i2c: imx258: Support faster pixel rate on binned modes git
2024-06-02 20:13 ` [PATCH v6 17/23] dt-bindings: media: imx258: Rename to include vendor prefix git
2024-06-02 20:13 ` [PATCH v6 18/23] dt-bindings: media: imx258: Add alternate compatible strings git
2024-06-02 20:13 ` [PATCH v6 19/23] media: i2c: imx258: Change register settings for variants of the sensor git
2024-06-02 20:13 ` [PATCH v6 20/23] media: i2c: imx258: Make HFLIP and VFLIP controls writable git
2024-06-02 20:13 ` [PATCH v6 21/23] media: i2c: imx258: Add support for reset gpio git
2024-06-02 20:13 ` [PATCH v6 22/23] media: i2c: imx258: Use v4l2_link_freq_to_bitmap helper git
2024-06-02 20:13 ` [PATCH v6 23/23] media: i2c: imx258: Convert to new CCI register access helpers git
2024-06-03  7:07 ` [PATCH v6 00/23] imx258 improvement series Luis Garcia

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240602201345.328737-11-git@luigi311.com \
    --to=git@luigi311.com \
    --cc=conor+dt@kernel.org \
    --cc=dave.stevenson@raspberrypi.com \
    --cc=devicetree@vger.kernel.org \
    --cc=festevam@gmail.com \
    --cc=imx@lists.linux.dev \
    --cc=jacopo.mondi@ideasonboard.com \
    --cc=kernel@pengutronix.de \
    --cc=krzysztof.kozlowski+dt@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-media@vger.kernel.org \
    --cc=mchehab@kernel.org \
    --cc=pavel@ucw.cz \
    --cc=phone-devel@vger.kernel.org \
    --cc=robh@kernel.org \
    --cc=s.hauer@pengutronix.de \
    --cc=sakari.ailus@linux.intel.com \
    --cc=shawnguo@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox