linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Daniel Scally <djrscally@gmail.com>
To: Daniel Scally <djrscally@gmail.com>,
	Mauro Carvalho Chehab <mchehab+huawei@kernel.org>,
	Sakari Ailus <sakari.ailus@linux.intel.com>,
	Paul Kocialkowski <paul.kocialkowski@bootlin.com>,
	Ezequiel Garcia <ezequiel@collabora.com>,
	Hans Verkuil <hverkuil-cisco@xs4all.nl>,
	Yang Li <yang.lee@linux.alibaba.com>,
	linux-media@vger.kernel.org (open list:MEDIA INPUT
	INFRASTRUCTURE (V4L/DVB)),
	linux-kernel@vger.kernel.org (open list)
Cc: Yong Zhi <yong.zhi@intel.com>, Bingbu Cao <bingbu.cao@intel.com>,
	Tianshu Qiu <tian.shu.qiu@intel.com>,
	Colin Ian King <colin.king@canonical.com>,
	laurent.pinchart@ideasonboard.com,
	kieran.bingham@ideasonboard.com
Subject: [PATCH 09/13] media: i2c: cap exposure at height + vblank in ov8865
Date: Thu, 22 Jul 2021 21:34:03 +0100	[thread overview]
Message-ID: <20210722203407.3588046-10-djrscally@gmail.com> (raw)
In-Reply-To: <20210722203407.3588046-1-djrscally@gmail.com>

Exposure limits depend on the total height; when vblank is altered (and
thus the total height is altered), change the exposure limits to reflect
the new cap.

Signed-off-by: Daniel Scally <djrscally@gmail.com>
---
 drivers/media/i2c/ov8865.c | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/drivers/media/i2c/ov8865.c b/drivers/media/i2c/ov8865.c
index e1d3c0d50fdc..941b0f94f249 100644
--- a/drivers/media/i2c/ov8865.c
+++ b/drivers/media/i2c/ov8865.c
@@ -662,6 +662,7 @@ struct ov8865_ctrls {
 	struct v4l2_ctrl *pixel_rate;
 	struct v4l2_ctrl *hblank;
 	struct v4l2_ctrl *vblank;
+	struct v4l2_ctrl *exposure;
 
 	struct v4l2_ctrl_handler handler;
 };
@@ -2455,6 +2456,18 @@ static int ov8865_s_ctrl(struct v4l2_ctrl *ctrl)
 	unsigned int index;
 	int ret;
 
+	/* If VBLANK is altered we need to update exposure to compensate */
+	if (ctrl->id == V4L2_CID_VBLANK) {
+		int exposure_max;
+
+		exposure_max = sensor->state.mode->output_size_y + ctrl->val;
+		__v4l2_ctrl_modify_range(sensor->ctrls.exposure,
+					 sensor->ctrls.exposure->minimum,
+					 exposure_max,
+					 sensor->ctrls.exposure->step,
+					 min(sensor->ctrls.exposure->val, exposure_max));
+	}
+
 	/* Wait for the sensor to be on before setting controls. */
 	if (pm_runtime_suspended(sensor->dev))
 		return 0;
@@ -2511,8 +2524,8 @@ static int ov8865_ctrls_init(struct ov8865_sensor *sensor)
 
 	/* Exposure */
 
-	v4l2_ctrl_new_std(handler, ops, V4L2_CID_EXPOSURE, 16, 1048575, 16,
-			  512);
+	ctrls->exposure = v4l2_ctrl_new_std(handler, ops, V4L2_CID_EXPOSURE, 16,
+					    1048575, 16, 512);
 
 	/* Gain */
 
@@ -2693,6 +2706,7 @@ static int ov8865_set_fmt(struct v4l2_subdev *subdev,
 	u32 mbus_code = 0;
 	unsigned int hblank;
 	unsigned int index;
+	int exposure_max;
 	int ret = 0;
 
 	mutex_lock(&sensor->mutex);
@@ -2740,6 +2754,12 @@ static int ov8865_set_fmt(struct v4l2_subdev *subdev,
 	__v4l2_ctrl_modify_range(sensor->ctrls.hblank, hblank, hblank, 1,
 				 hblank);
 
+	exposure_max = mode->vts;
+	__v4l2_ctrl_modify_range(sensor->ctrls.exposure,
+				 sensor->ctrls.exposure->minimum, exposure_max,
+				 sensor->ctrls.exposure->step,
+				 min(sensor->ctrls.exposure->val, exposure_max));
+
 complete:
 	mutex_unlock(&sensor->mutex);
 
-- 
2.25.1


  parent reply	other threads:[~2021-07-22 20:35 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-22 20:33 [PATCH 00/13] Extensions to ov8865 driver Daniel Scally
2021-07-22 20:33 ` [PATCH 01/13] media: i2c: Add ACPI support to ov8865 Daniel Scally
     [not found]   ` <CAHp75VfC1QMu=BcMZP8-vX_2paDp4CXqEYEDQnN+7=s3Up9VjA@mail.gmail.com>
2021-07-22 23:09     ` Daniel Scally
2021-07-22 20:33 ` [PATCH 02/13] media: i2c: Fix incorrect value in comment Daniel Scally
2021-07-23  7:44   ` Paul Kocialkowski
2021-07-23  9:17     ` Daniel Scally
2021-07-22 20:33 ` [PATCH 03/13] media: i2c: Defer probe if not endpoint found Daniel Scally
2021-07-23  7:49   ` Paul Kocialkowski
2021-07-23  9:15     ` Daniel Scally
2021-07-22 20:33 ` [PATCH 04/13] media: i2c: Support 19.2MHz input clock in ov8865 Daniel Scally
2021-07-22 20:33 ` [PATCH 05/13] media: i2c: Add .get_selection() support to ov8865 Daniel Scally
2021-07-23  8:13   ` kernel test robot
2021-07-22 20:34 ` [PATCH 06/13] media: i2c: Switch control to V4L2_CID_ANALOGUE_GAIN Daniel Scally
2021-07-23  7:57   ` Paul Kocialkowski
2021-07-23 12:00     ` Daniel Scally
2021-07-22 20:34 ` [PATCH 07/13] media: i2c: Add vblank control to ov8865 Daniel Scally
2021-07-22 20:34 ` [PATCH 08/13] media: i2c: Add hblank " Daniel Scally
2021-07-22 20:34 ` Daniel Scally [this message]
2021-07-22 20:34 ` [PATCH 10/13] media: i2c: Add controls from fwnode " Daniel Scally
2021-07-22 20:34 ` [PATCH 11/13] media: i2c: Switch exposure control unit to lines Daniel Scally
2021-07-22 20:34 ` [PATCH 12/13] media: i2c: Remove unused macros from ov8865 Daniel Scally
     [not found]   ` <CAHp75Vcmo8rD=WpECbKfpByBr1pAL+7gV2eycZ=3M+YDWUzOFw@mail.gmail.com>
2021-07-23  8:00     ` Paul Kocialkowski
2021-07-23  9:07       ` Daniel Scally
2021-07-22 20:34 ` [PATCH 13/13] media: ipu3-cio2: Add INT347A to cio2-bridge Daniel Scally
     [not found]   ` <CAHp75Vc60J1kTs0Kv5ibc+5zqCTvRDDAcmHFKFDi-4Qd-rBHuA@mail.gmail.com>
2021-07-22 23:07     ` Daniel Scally

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=20210722203407.3588046-10-djrscally@gmail.com \
    --to=djrscally@gmail.com \
    --cc=bingbu.cao@intel.com \
    --cc=colin.king@canonical.com \
    --cc=ezequiel@collabora.com \
    --cc=hverkuil-cisco@xs4all.nl \
    --cc=kieran.bingham@ideasonboard.com \
    --cc=laurent.pinchart@ideasonboard.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-media@vger.kernel.org \
    --cc=mchehab+huawei@kernel.org \
    --cc=paul.kocialkowski@bootlin.com \
    --cc=sakari.ailus@linux.intel.com \
    --cc=tian.shu.qiu@intel.com \
    --cc=yang.lee@linux.alibaba.com \
    --cc=yong.zhi@intel.com \
    --subject='Re: [PATCH 09/13] media: i2c: cap exposure at height + vblank in ov8865' \
    /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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).