All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jacopo Mondi <jacopo@jmondi.org>
To: slongerbeam@gmail.com
Cc: laurent.pinchart@ideasonboard.com, sakari.ailus@iki.fi,
	hverkuil-cisco@xs4all.nl, mirela.rabulea@nxp.com,
	xavier.roumegue@oss.nxp.com, tomi.valkeinen@ideasonboard.com,
	hugues.fruchet@st.com, prabhakar.mahadev-lad.rj@bp.renesas.com,
	aford173@gmail.com, festevam@gmail.com,
	eugen.hristev@microchip.com, jbrunet@baylibre.com,
	mchehab@kernel.org, linux-media@vger.kernel.org,
	Jacopo Mondi <jacopo@jmondi.org>
Subject: [PATCH v2 14/23] media: ov5640: Add VBLANK control
Date: Thu, 10 Feb 2022 12:09:59 +0100	[thread overview]
Message-ID: <20220210111004.152859-2-jacopo@jmondi.org> (raw)
In-Reply-To: <20220210110458.152494-1-jacopo@jmondi.org>

Add the VBLANK control which allows to select the duration of the
frame vertical blankings and allows to control the framerate.

The VBLANK control also modifies the exposure time range, which cannot
exceed the maximum frame length.

Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
---
 drivers/media/i2c/ov5640.c | 53 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)

diff --git a/drivers/media/i2c/ov5640.c b/drivers/media/i2c/ov5640.c
index ade9adb43fda..30b706a98eb9 100644
--- a/drivers/media/i2c/ov5640.c
+++ b/drivers/media/i2c/ov5640.c
@@ -29,6 +29,12 @@
 #define OV5640_XCLK_MIN  6000000
 #define OV5640_XCLK_MAX 54000000
 
+#define OV5640_LINK_RATE_MAX	490000000U
+
+/* FIXME: not documented. */
+#define OV5640_MIN_VBLANK	24
+#define OV5640_MAX_VTS		1968
+
 #define OV5640_DEFAULT_SLAVE_ID 0x3c
 
 #define OV5640_LINK_RATE_MAX		490000000U
@@ -301,6 +307,7 @@ struct ov5640_ctrls {
 	struct v4l2_ctrl *pixel_rate;
 	struct v4l2_ctrl *link_freq;
 	struct v4l2_ctrl *hblank;
+	struct v4l2_ctrl *vblank;
 	struct {
 		struct v4l2_ctrl *auto_exp;
 		struct v4l2_ctrl *exposure;
@@ -2553,6 +2560,7 @@ static int ov5640_update_pixel_rate(struct ov5640_dev *sensor)
 	const struct ov5640_mode_info *mode = sensor->current_mode;
 	struct v4l2_mbus_framefmt *fmt = &sensor->fmt;
 	enum ov5640_pixel_rate_id pixel_rate_id = mode->pixel_rate;
+	s64 exposure_val, exposure_max;
 	unsigned int hblank;
 	unsigned int i = 0;
 	u32 pixel_rate;
@@ -2610,6 +2618,20 @@ static int ov5640_update_pixel_rate(struct ov5640_dev *sensor)
 	__v4l2_ctrl_modify_range(sensor->ctrls.hblank,
 				 hblank, hblank, 1, hblank);
 
+	__v4l2_ctrl_modify_range(sensor->ctrls.vblank,
+				 OV5640_MIN_VBLANK,
+				 OV5640_MAX_VTS - mode->crop.height, 1,
+				 mode->vblank_def);
+	__v4l2_ctrl_s_ctrl(sensor->ctrls.vblank, mode->vblank_def);
+
+	exposure_max = mode->crop.height + mode->vblank_def - 4;
+	exposure_val = clamp((s64)sensor->ctrls.exposure->val,
+			     (s64)sensor->ctrls.exposure->minimum,
+			     (s64)exposure_max);
+	__v4l2_ctrl_modify_range(sensor->ctrls.exposure,
+				 sensor->ctrls.exposure->minimum,
+				 exposure_max, 1, exposure_val);
+
 	return 0;
 }
 
@@ -2982,6 +3004,15 @@ static int ov5640_set_ctrl_vflip(struct ov5640_dev *sensor, int value)
 			      (BIT(2) | BIT(1)) : 0);
 }
 
+static int ov5640_set_ctrl_vblank(struct ov5640_dev *sensor, int value)
+{
+	const struct ov5640_mode_info *mode = sensor->current_mode;
+
+	/* Update the VTOT timing register value. */
+	return ov5640_write_reg16(sensor, OV5640_REG_TIMING_VTS,
+				  mode->crop.height + value);
+}
+
 static int ov5640_g_volatile_ctrl(struct v4l2_ctrl *ctrl)
 {
 	struct v4l2_subdev *sd = ctrl_to_sd(ctrl);
@@ -3012,10 +3043,23 @@ static int ov5640_s_ctrl(struct v4l2_ctrl *ctrl)
 {
 	struct v4l2_subdev *sd = ctrl_to_sd(ctrl);
 	struct ov5640_dev *sensor = to_ov5640_dev(sd);
+	const struct ov5640_mode_info *mode = sensor->current_mode;
+	unsigned int exp_max;
 	int ret;
 
 	/* v4l2_ctrl_lock() locks our own mutex */
 
+	switch (ctrl->id) {
+	case V4L2_CID_VBLANK:
+		/* Update the exposure range to the newly programmed vblank. */
+		exp_max = mode->crop.height + ctrl->val - 4;
+		__v4l2_ctrl_modify_range(sensor->ctrls.exposure,
+					 sensor->ctrls.exposure->minimum,
+					 exp_max, sensor->ctrls.exposure->step,
+					 mode->vblank_def);
+		break;
+	}
+
 	/*
 	 * If the device is not powered up by the host driver do
 	 * not apply any controls to H/W at this time. Instead
@@ -3055,6 +3099,9 @@ static int ov5640_s_ctrl(struct v4l2_ctrl *ctrl)
 	case V4L2_CID_VFLIP:
 		ret = ov5640_set_ctrl_vflip(sensor, ctrl->val);
 		break;
+	case V4L2_CID_VBLANK:
+		ret = ov5640_set_ctrl_vblank(sensor, ctrl->val);
+		break;
 	default:
 		ret = -EINVAL;
 		break;
@@ -3074,6 +3121,7 @@ static int ov5640_init_controls(struct ov5640_dev *sensor)
 	const struct v4l2_ctrl_ops *ops = &ov5640_ctrl_ops;
 	struct ov5640_ctrls *ctrls = &sensor->ctrls;
 	struct v4l2_ctrl_handler *hdl = &ctrls->handler;
+	unsigned int max_vblank;
 	unsigned int hblank;
 	int ret;
 
@@ -3097,6 +3145,11 @@ static int ov5640_init_controls(struct ov5640_dev *sensor)
 	ctrls->hblank = v4l2_ctrl_new_std(hdl, ops, V4L2_CID_HBLANK, hblank,
 					  hblank, 1, hblank);
 
+	max_vblank = OV5640_MAX_VTS - mode->crop.height;
+	ctrls->vblank = v4l2_ctrl_new_std(hdl, ops, V4L2_CID_VBLANK,
+					  OV5640_MIN_VBLANK, max_vblank,
+					  1, mode->vblank_def);
+
 	/* Auto/manual white balance */
 	ctrls->auto_wb = v4l2_ctrl_new_std(hdl, ops,
 					   V4L2_CID_AUTO_WHITE_BALANCE,
-- 
2.35.0


  parent reply	other threads:[~2022-02-10 11:09 UTC|newest]

Thread overview: 64+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-02-10 11:04 [PATCH v2 00/23] media: ov5640: Rework the clock tree programming for MIPI Jacopo Mondi
2022-02-10 11:04 ` [PATCH v2 01/23] media: ov5640: Add pixel rate to modes Jacopo Mondi
2022-02-20 11:53   ` Laurent Pinchart
2022-02-21 20:14     ` Adam Ford
2022-02-22  7:48       ` Jacopo Mondi
2022-02-22 19:08         ` Adam Ford
2022-02-10 11:04 ` [PATCH v2 02/23] media: ov5604: Re-arrange modes definition Jacopo Mondi
2022-02-10 11:04 ` [PATCH v2 03/23] media: ov5640: Add ov5640_is_csi2() function Jacopo Mondi
2022-02-10 11:04 ` [PATCH v2 04/23] media: ov5640: Associate bpp with formats Jacopo Mondi
2022-02-10 11:04 ` [PATCH v2 05/23] media: ov5640: Add LINK_FREQ control Jacopo Mondi
2022-02-20 11:55   ` Laurent Pinchart
2022-02-10 11:04 ` [PATCH v2 06/23] media: ov5640: Update pixel_rate and link_freq Jacopo Mondi
2022-02-10 11:04 ` [PATCH v2 07/23] media: ov5640: Rework CSI-2 clock tree Jacopo Mondi
2022-02-20 12:17   ` Laurent Pinchart
2022-02-21 11:39     ` Jacopo Mondi
2022-02-21 12:12       ` Laurent Pinchart
2022-02-10 11:04 ` [PATCH v2 08/23] media: ov5640: Rework timings programming Jacopo Mondi
2022-02-20 12:44   ` Laurent Pinchart
2022-02-10 11:04 ` [PATCH v2 09/23] media: ov5640: Fix 720x480 in RGB888 mode Jacopo Mondi
2022-02-20 12:50   ` Laurent Pinchart
2022-02-10 11:04 ` [PATCH v2 10/23] media: ov5640: Rework analog crop rectangles Jacopo Mondi
2022-02-11  9:34   ` [v2.1] " Jacopo Mondi
2022-02-20 12:56     ` Laurent Pinchart
2022-02-10 11:04 ` [PATCH v2 11/23] media: ov5640: Re-sort per-mode register tables Jacopo Mondi
2022-02-20 12:52   ` Laurent Pinchart
2022-02-20 12:59     ` Laurent Pinchart
2022-02-10 11:04 ` [PATCH v2 12/23] media: ov5640: Remove ov5640_mode_init_data Jacopo Mondi
2022-02-20 12:58   ` Laurent Pinchart
2022-02-10 11:09 ` [PATCH v2 13/23] media: ov5640: Add HBLANK control Jacopo Mondi
2022-02-10 11:09 ` Jacopo Mondi [this message]
2022-02-20 13:01   ` [PATCH v2 14/23] media: ov5640: Add VBLANK control Laurent Pinchart
2022-02-10 11:10 ` [PATCH v2 15/23] media: ov5640: Fix durations to comply with FPS Jacopo Mondi
2022-02-20 13:03   ` Laurent Pinchart
2022-02-10 11:10 ` [PATCH v2 16/23] media: ov5640: Implement init_cfg Jacopo Mondi
2022-02-10 11:10 ` [PATCH v2 17/23] media: ov5640: Implement get_selection Jacopo Mondi
2022-02-20 13:06   ` Laurent Pinchart
2022-02-10 11:10 ` [PATCH v2 18/23] media: ov5640: Limit frame_interval to DVP mode only Jacopo Mondi
2022-02-10 11:10 ` [PATCH v2 19/23] media: ov5640: Register device properties Jacopo Mondi
2022-02-10 11:10 ` [PATCH v2 20/23] media: ov5640: Add RGB565_1X16 format Jacopo Mondi
2022-02-20 13:07   ` Laurent Pinchart
2022-02-10 11:10 ` [PATCH v2 21/23] media: ov5640: Add RGB888/BGR888 formats Jacopo Mondi
2022-02-20 13:13   ` Laurent Pinchart
2022-02-10 11:10 ` [PATCH v2 22/23] media: ov5640: Restrict sizes to mbus code Jacopo Mondi
2022-02-20 13:16   ` Laurent Pinchart
2022-02-21 12:42     ` Jacopo Mondi
2022-02-10 11:10 ` [PATCH v2 23/23] media: ov5640: Adjust format to bpp in s_fmt Jacopo Mondi
2022-02-10 12:03 ` [PATCH v2 00/23] media: ov5640: Rework the clock tree programming for MIPI Tomi Valkeinen
2022-02-10 12:10   ` Tomi Valkeinen
2022-02-10 13:00 ` Tomi Valkeinen
2022-02-10 17:11   ` Jacopo Mondi
2022-02-11  7:55     ` Tomi Valkeinen
2022-02-11  8:01       ` Tomi Valkeinen
2022-02-11  9:36   ` Jacopo Mondi
2022-02-11 10:09 ` Eugen.Hristev
2022-02-11 11:25   ` Jacopo Mondi
2022-02-14 14:06     ` Eugen.Hristev
2022-02-14 14:38       ` Jacopo Mondi
2022-02-14 15:08         ` Eugen.Hristev
2022-02-14 18:56           ` Jacopo Mondi
2022-02-17 14:25             ` Eugen.Hristev
2022-02-21  8:51               ` Jacopo Mondi
2022-02-21  9:04                 ` Eugen.Hristev
2022-02-21 11:18                   ` Jacopo Mondi
2022-02-21 13:31                   ` Jacopo Mondi

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=20220210111004.152859-2-jacopo@jmondi.org \
    --to=jacopo@jmondi.org \
    --cc=aford173@gmail.com \
    --cc=eugen.hristev@microchip.com \
    --cc=festevam@gmail.com \
    --cc=hugues.fruchet@st.com \
    --cc=hverkuil-cisco@xs4all.nl \
    --cc=jbrunet@baylibre.com \
    --cc=laurent.pinchart@ideasonboard.com \
    --cc=linux-media@vger.kernel.org \
    --cc=mchehab@kernel.org \
    --cc=mirela.rabulea@nxp.com \
    --cc=prabhakar.mahadev-lad.rj@bp.renesas.com \
    --cc=sakari.ailus@iki.fi \
    --cc=slongerbeam@gmail.com \
    --cc=tomi.valkeinen@ideasonboard.com \
    --cc=xavier.roumegue@oss.nxp.com \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.