From: Jacopo Mondi <jacopo@jmondi.org>
To: mchehab@kernel.org, sakari.ailus@linux.intel.com,
hverkuil@xs4all.nl, laurent.pinchart@ideasonboard.com,
roman.kovalivskyi@globallogic.com,
dave.stevenson@raspberrypi.org, naush@raspberrypi.com
Cc: mrodin@de.adit-jv.com, hugues.fruchet@st.com, mripard@kernel.org,
aford173@gmail.com, sudipi@jp.adit-jv.com,
andrew_gabbasov@mentor.com, erosca@de.adit-jv.com,
linux-media@vger.kernel.org, libcamera-devel@lists.libcamera.org,
Jacopo Mondi <jacopo@jmondi.org>
Subject: [PATCH 23/25] media: ov5647: Support V4L2_CID_HBLANK control
Date: Tue, 23 Jun 2020 18:55:48 +0200 [thread overview]
Message-ID: <20200623165550.45835-4-jacopo@jmondi.org> (raw)
In-Reply-To: <20200623100815.10674-1-jacopo@jmondi.org>
Add support for the V4L2_CID_HBLANK read-only control.
The implementation has been upported from RaspberryPi BSP commit:
commit d82f202156605 ("media: i2c: ov5647: Set V4L2_SUBDEV_FL_HAS_EVENTS flag")
Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
---
drivers/media/i2c/ov5647.c | 26 +++++++++++++++++++++++++-
1 file changed, 25 insertions(+), 1 deletion(-)
diff --git a/drivers/media/i2c/ov5647.c b/drivers/media/i2c/ov5647.c
index 218576a05e66b..3467a8090b38d 100644
--- a/drivers/media/i2c/ov5647.c
+++ b/drivers/media/i2c/ov5647.c
@@ -77,6 +77,7 @@ struct ov5647_mode {
struct v4l2_mbus_framefmt format;
struct v4l2_rect crop;
u64 pixel_rate;
+ int hts;
struct regval_list *reg_list;
unsigned int num_regs;
};
@@ -99,6 +100,7 @@ struct ov5647 {
struct ov5647_mode *mode;
struct ov5647_mode *current_mode;
struct v4l2_ctrl *pixel_rate;
+ struct v4l2_ctrl *hblank;
};
static inline struct ov5647 *to_sensor(struct v4l2_subdev *sd)
@@ -586,6 +588,7 @@ static struct ov5647_mode ov5647_sbggr8_modes[] = {
.height = 960,
},
.pixel_rate = 77291670,
+ .hts = 1896,
.reg_list = ov5647_640x480_sbggr8,
.num_regs = ARRAY_SIZE(ov5647_640x480_sbggr8)
},
@@ -608,6 +611,7 @@ static struct ov5647_mode ov5647_sbggr10_modes[] = {
.height = 1944
},
.pixel_rate = 87500000,
+ .hts = 2844,
.reg_list = ov5647_2592x1944_sbggr10,
.num_regs = ARRAY_SIZE(ov5647_2592x1944_sbggr10)
},
@@ -627,6 +631,7 @@ static struct ov5647_mode ov5647_sbggr10_modes[] = {
.height = 1080,
},
.pixel_rate = 81666700,
+ .hts = 2416,
.reg_list = ov5647_1080p30_sbggr10,
.num_regs = ARRAY_SIZE(ov5647_1080p30_sbggr10)
},
@@ -646,6 +651,7 @@ static struct ov5647_mode ov5647_sbggr10_modes[] = {
.height = 1944,
},
.pixel_rate = 81666700,
+ .hts = 1896,
.reg_list = ov5647_2x2binned_sbggr10,
.num_regs = ARRAY_SIZE(ov5647_2x2binned_sbggr10)
},
@@ -665,6 +671,7 @@ static struct ov5647_mode ov5647_sbggr10_modes[] = {
.height = 1920,
},
.pixel_rate = 55000000,
+ .hts = 1852,
.reg_list = ov5647_640x480_sbggr10,
.num_regs = ARRAY_SIZE(ov5647_640x480_sbggr10)
},
@@ -1072,6 +1079,7 @@ static int ov5647_set_pad_fmt(struct v4l2_subdev *sd,
struct ov5647_mode *ov5647_mode_list;
struct ov5647_mode *mode;
unsigned int num_modes;
+ int hblank;
/*
* Default mbus code MEDIA_BUS_FMT_SBGGR10_1X10 if the requested one
@@ -1105,6 +1113,9 @@ static int ov5647_set_pad_fmt(struct v4l2_subdev *sd,
__v4l2_ctrl_modify_range(sensor->pixel_rate, mode->pixel_rate,
mode->pixel_rate, 1, mode->pixel_rate);
+ hblank = mode->hts - mode->format.width;
+ __v4l2_ctrl_modify_range(sensor->hblank, hblank, hblank, 1, hblank);
+
*fmt = mode->format;
mutex_unlock(&sensor->lock);
@@ -1309,6 +1320,9 @@ static int ov5647_s_ctrl(struct v4l2_ctrl *ctrl)
case V4L2_CID_PIXEL_RATE:
/* Read-only, but we adjust it based on mode. */
return 0;
+ case V4L2_CID_HBLANK:
+ /* Read-only, but we adjust it based on mode. */
+ return 0;
default:
dev_info(&client->dev,
"Control (id:0x%x, val:0x%x) not supported\n",
@@ -1326,8 +1340,9 @@ static const struct v4l2_ctrl_ops ov5647_ctrl_ops = {
static int ov5647_init_controls(struct ov5647 *sensor)
{
struct i2c_client *client = v4l2_get_subdevdata(&sensor->sd);
+ int hblank;
- v4l2_ctrl_handler_init(&sensor->ctrls, 6);
+ v4l2_ctrl_handler_init(&sensor->ctrls, 7);
v4l2_ctrl_new_std(&sensor->ctrls, &ov5647_ctrl_ops,
V4L2_CID_AUTOGAIN, 0, 1, 1, 0);
@@ -1357,6 +1372,15 @@ static int ov5647_init_controls(struct ov5647 *sensor)
goto handler_free;
sensor->pixel_rate->flags |= V4L2_CTRL_FLAG_READ_ONLY;
+ /* 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,
+ hblank);
+ if (!sensor->hblank)
+ goto handler_free;
+ sensor->hblank->flags |= V4L2_CTRL_FLAG_READ_ONLY;
+
if (sensor->ctrls.error)
goto handler_free;
--
2.27.0
next prev parent reply other threads:[~2020-06-23 16:52 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-23 10:07 [PATCH 00/25] media: ov5647: Support RaspberryPi Camera Module v1 Jacopo Mondi
2020-06-23 10:07 ` [PATCH 01/25] dt-bindings: media: ov5647: Document pwdn-gpios Jacopo Mondi
2020-06-23 10:07 ` [PATCH 02/25] dt-bindings: media: ov5647: Document clock-noncontinuous Jacopo Mondi
2020-06-23 10:07 ` [PATCH 03/25] media: ov5647: Add support for PWDN GPIO Jacopo Mondi
2020-07-09 20:04 ` [libcamera-devel] " Dafna Hirschfeld
2020-07-14 12:45 ` Jacopo Mondi
2020-06-23 10:07 ` [PATCH 04/25] media: ov5647: Add support for non-continuous clock mode Jacopo Mondi
2020-06-23 10:07 ` [PATCH 05/25] media: ov5647: Add set_fmt and get_fmt calls Jacopo Mondi
2020-06-23 10:07 ` [PATCH 06/25] media: ov5647: Fix format initialization Jacopo Mondi
2020-06-23 10:07 ` [PATCH 07/25] media: ov5647: Fix style issues Jacopo Mondi
2020-06-23 10:07 ` [PATCH 08/25] media: ov5647: Replace license with SPDX identifier Jacopo Mondi
2020-06-23 10:07 ` [PATCH 09/25] media: ov5647: Fix return value from read/write Jacopo Mondi
2020-06-23 10:08 ` [PATCH 10/25] media: ov5647: Program mode at s_stream(1) time Jacopo Mondi
2020-06-23 16:42 ` [PATCH 11/25] media: ov5647: Implement enum_frame_size() Jacopo Mondi
2020-08-18 7:33 ` Sakari Ailus
2020-08-18 7:38 ` Sakari Ailus
2020-06-23 16:42 ` [PATCH 12/25] media: ov5647: Protect s_stream() with mutex Jacopo Mondi
2020-06-23 16:42 ` [PATCH 13/25] media: ov5647: Support gain, exposure and AWB controls Jacopo Mondi
2020-06-23 16:42 ` [PATCH 14/25] media: ov5647: Rationalize driver structure name Jacopo Mondi
2020-06-23 16:42 ` [PATCH 15/25] media: ov5647: Break out format handling Jacopo Mondi
2020-07-31 11:44 ` Sakari Ailus
2020-06-23 16:49 ` [PATCH 16/25] media: ov5647: Add support for get_selection() Jacopo Mondi
2020-07-09 19:56 ` [libcamera-devel] " Dafna Hirschfeld
2020-06-23 16:49 ` [PATCH 17/25] media: ov5647: Rename SBGGR8 VGA mode Jacopo Mondi
2020-06-23 16:49 ` [PATCH 18/25] media: ov5647: Add SGGBR10_1X10 modes Jacopo Mondi
2020-06-23 16:49 ` [PATCH 19/25] media: ov5647: Implement set_fmt pad operation Jacopo Mondi
2020-06-29 16:54 ` [libcamera-devel] " Dafna Hirschfeld
2020-06-30 10:13 ` Jacopo Mondi
2020-06-30 11:09 ` Dafna Hirschfeld
2020-06-23 16:55 ` [PATCH 20/25] media: ov5647: Program mode only if it has changed Jacopo Mondi
2020-06-29 17:48 ` Dafna Hirschfeld
2020-06-30 7:43 ` Jacopo Mondi
2020-06-30 9:32 ` Dafna Hirschfeld
2020-06-30 10:06 ` Jacopo Mondi
2020-06-30 10:56 ` Dafna Hirschfeld
2020-06-30 12:05 ` Jacopo Mondi
2020-06-30 13:01 ` Dafna Hirschfeld
2020-06-30 14:53 ` [libcamera-devel] " Dave Stevenson
2020-06-30 15:11 ` Dafna Hirschfeld
2020-07-01 7:25 ` Laurent Pinchart
2020-07-03 12:21 ` Jacopo Mondi
2020-07-03 16:33 ` Laurent Pinchart
2020-06-23 16:55 ` [PATCH 21/25] media: ov5647: Set V4L2_SUBDEV_FL_HAS_EVENTS flag Jacopo Mondi
2020-06-23 16:55 ` [PATCH 22/25] media: ov5647: Support V4L2_CID_PIXEL_RATE Jacopo Mondi
2020-06-29 17:01 ` [libcamera-devel] " Dafna Hirschfeld
2020-06-29 21:25 ` Dave Stevenson
2020-06-30 15:13 ` Dave Stevenson
2020-07-01 7:21 ` Laurent Pinchart
2020-06-23 16:55 ` Jacopo Mondi [this message]
2020-06-23 16:55 ` [PATCH 24/25] media: ov5647: Support V4L2_CID_VBLANK control Jacopo Mondi
2020-06-23 16:55 ` [PATCH 25/25] media: ov5647: Advertise the correct exposure range Jacopo Mondi
2020-06-29 17:33 ` [PATCH 00/25] media: ov5647: Support RaspberryPi Camera Module v1 Dafna Hirschfeld
2020-06-29 18:08 ` Dafna Hirschfeld
2020-07-10 15:59 ` Dafna Hirschfeld
2020-07-14 12:48 ` 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=20200623165550.45835-4-jacopo@jmondi.org \
--to=jacopo@jmondi.org \
--cc=aford173@gmail.com \
--cc=andrew_gabbasov@mentor.com \
--cc=dave.stevenson@raspberrypi.org \
--cc=erosca@de.adit-jv.com \
--cc=hugues.fruchet@st.com \
--cc=hverkuil@xs4all.nl \
--cc=laurent.pinchart@ideasonboard.com \
--cc=libcamera-devel@lists.libcamera.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=mripard@kernel.org \
--cc=mrodin@de.adit-jv.com \
--cc=naush@raspberrypi.com \
--cc=roman.kovalivskyi@globallogic.com \
--cc=sakari.ailus@linux.intel.com \
--cc=sudipi@jp.adit-jv.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 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).