{"id":4171,"url":"https://patchwork.libcamera.org/api/1.1/patches/4171/?format=json","web_url":"https://patchwork.libcamera.org/patch/4171/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20200623165550.45835-5-jacopo@jmondi.org>","date":"2020-06-23T16:55:49","name":"[libcamera-devel,24/25] media: ov5647: Support V4L2_CID_VBLANK control","commit_ref":null,"pull_url":null,"state":"not-applicable","archived":false,"hash":"6dc8c8e72f6d8bff9c8c12f15848d7e7f124a4db","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/1.1/people/3/?format=json","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"delegate":{"id":15,"url":"https://patchwork.libcamera.org/api/1.1/users/15/?format=json","username":"jmondi","first_name":"Jacopo","last_name":"Mondi","email":"jacopo@jmondi.org"},"mbox":"https://patchwork.libcamera.org/patch/4171/mbox/","series":[{"id":1030,"url":"https://patchwork.libcamera.org/api/1.1/series/1030/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1030","date":"2020-06-23T10:07:50","name":"media: ov5647: Support RaspberryPi Camera Module v1","version":1,"mbox":"https://patchwork.libcamera.org/series/1030/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/4171/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/4171/checks/","tags":{},"headers":{"Return-Path":"","Received":["from relay12.mail.gandi.net (relay12.mail.gandi.net\n\t[217.70.178.232])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 05E1860103\n\tfor ;\n\tTue, 23 Jun 2020 18:52:57 +0200 (CEST)","from uno.lan (93-34-118-233.ip49.fastwebnet.it [93.34.118.233])\n\t(Authenticated sender: jacopo@jmondi.org)\n\tby relay12.mail.gandi.net (Postfix) with ESMTPSA id 95D46200014;\n\tTue, 23 Jun 2020 16:52:53 +0000 (UTC)"],"From":"Jacopo Mondi ","To":"mchehab@kernel.org, sakari.ailus@linux.intel.com, hverkuil@xs4all.nl,\n\tlaurent.pinchart@ideasonboard.com, roman.kovalivskyi@globallogic.com, \n\tdave.stevenson@raspberrypi.org, naush@raspberrypi.com","Cc":"mrodin@de.adit-jv.com, hugues.fruchet@st.com, mripard@kernel.org,\n\taford173@gmail.com, sudipi@jp.adit-jv.com, andrew_gabbasov@mentor.com,\n\terosca@de.adit-jv.com, linux-media@vger.kernel.org,\n\tlibcamera-devel@lists.libcamera.org,\n\tDave Stevenson ,\n\tJacopo Mondi ","Date":"Tue, 23 Jun 2020 18:55:49 +0200","Message-Id":"<20200623165550.45835-5-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.27.0","In-Reply-To":"<20200623100815.10674-1-jacopo@jmondi.org>","References":"<20200623100815.10674-1-jacopo@jmondi.org>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH 24/25] media: ov5647: Support\n\tV4L2_CID_VBLANK control","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Tue, 23 Jun 2020 16:52:57 -0000"},"content":"From: Dave Stevenson \n\nAdds vblank control to allow for frame rate control.\n\nSigned-off-by: Dave Stevenson \nSigned-off-by: Jacopo Mondi \n---\n drivers/media/i2c/ov5647.c | 46 +++++++++++++++++++++++++++++++++++---\n 1 file changed, 43 insertions(+), 3 deletions(-)","diff":"diff --git a/drivers/media/i2c/ov5647.c b/drivers/media/i2c/ov5647.c\nindex 3467a8090b38d..209218fb073d6 100644\n--- a/drivers/media/i2c/ov5647.c\n+++ b/drivers/media/i2c/ov5647.c\n@@ -50,6 +50,8 @@\n #define OV5647_REG_AEC_AGC\t\t0x3503\n #define OV5647_REG_GAIN_HI\t\t0x350a\n #define OV5647_REG_GAIN_LO\t\t0x350b\n+#define OV5647_REG_VTS_HI\t\t0x380e\n+#define OV5647_REG_VTS_LO\t\t0x380f\n #define OV5647_REG_FRAME_OFF_NUMBER\t0x4202\n #define OV5647_REG_MIPI_CTRL00\t\t0x4800\n #define OV5647_REG_MIPI_CTRL14\t\t0x4814\n@@ -68,6 +70,9 @@\n #define OV5647_PIXEL_ARRAY_WIDTH\t2592U\n #define OV5647_PIXEL_ARRAY_HEIGHT\t1944U\n \n+#define OV5647_VBLANK_MIN\t\t4\n+#define OV5647_VTS_MAX\t\t\t32767\n+\n struct regval_list {\n \tu16 addr;\n \tu8 data;\n@@ -78,6 +83,7 @@ struct ov5647_mode {\n \tstruct v4l2_rect\t\tcrop;\n \tu64\t\t\t\tpixel_rate;\n \tint\t\t\t\thts;\n+\tint\t\t\t\tvts;\n \tstruct regval_list\t\t*reg_list;\n \tunsigned int\t\t\tnum_regs;\n };\n@@ -101,6 +107,7 @@ struct ov5647 {\n \tstruct ov5647_mode\t\t*current_mode;\n \tstruct v4l2_ctrl\t\t*pixel_rate;\n \tstruct v4l2_ctrl\t\t*hblank;\n+\tstruct v4l2_ctrl\t\t*vblank;\n };\n \n static inline struct ov5647 *to_sensor(struct v4l2_subdev *sd)\n@@ -152,8 +159,6 @@ static struct regval_list ov5647_640x480_sbggr8[] = {\n \t{0x3b07, 0x0c},\n \t{0x380c, 0x07},\n \t{0x380d, 0x68},\n-\t{0x380e, 0x03},\n-\t{0x380f, 0xd8},\n \t{0x3814, 0x31},\n \t{0x3815, 0x31},\n \t{0x3708, 0x64},\n@@ -589,6 +594,7 @@ static struct ov5647_mode ov5647_sbggr8_modes[] = {\n \t\t},\n \t\t.pixel_rate\t= 77291670,\n \t\t.hts\t\t= 1896,\n+\t\t.vts\t\t= 0x3d8,\n \t\t.reg_list\t= ov5647_640x480_sbggr8,\n \t\t.num_regs\t= ARRAY_SIZE(ov5647_640x480_sbggr8)\n \t},\n@@ -612,6 +618,7 @@ static struct ov5647_mode ov5647_sbggr10_modes[] = {\n \t\t},\n \t\t.pixel_rate\t= 87500000,\n \t\t.hts\t\t= 2844,\n+\t\t.vts\t\t= 0x7b0,\n \t\t.reg_list\t= ov5647_2592x1944_sbggr10,\n \t\t.num_regs\t= ARRAY_SIZE(ov5647_2592x1944_sbggr10)\n \t},\n@@ -632,6 +639,7 @@ static struct ov5647_mode ov5647_sbggr10_modes[] = {\n \t\t},\n \t\t.pixel_rate\t= 81666700,\n \t\t.hts\t\t= 2416,\n+\t\t.vts\t\t= 0x450,\n \t\t.reg_list\t= ov5647_1080p30_sbggr10,\n \t\t.num_regs\t= ARRAY_SIZE(ov5647_1080p30_sbggr10)\n \t},\n@@ -652,6 +660,7 @@ static struct ov5647_mode ov5647_sbggr10_modes[] = {\n \t\t},\n \t\t.pixel_rate\t= 81666700,\n \t\t.hts\t\t= 1896,\n+\t\t.vts\t\t= 0x59b,\n \t\t.reg_list\t= ov5647_2x2binned_sbggr10,\n \t\t.num_regs\t= ARRAY_SIZE(ov5647_2x2binned_sbggr10)\n \t},\n@@ -672,6 +681,7 @@ static struct ov5647_mode ov5647_sbggr10_modes[] = {\n \t\t},\n \t\t.pixel_rate\t= 55000000,\n \t\t.hts\t\t= 1852,\n+\t\t.vts\t\t= 0x1f8,\n \t\t.reg_list\t= ov5647_640x480_sbggr10,\n \t\t.num_regs\t= ARRAY_SIZE(ov5647_640x480_sbggr10)\n \t},\n@@ -695,6 +705,22 @@ static const struct ov5647_format_list ov5647_formats[] = {\n #define OV5647_DEFAULT_MODE\t(&ov5647_formats[0].modes[0])\n #define OV5647_DEFAULT_FORMAT\t(ov5647_formats[0].modes[0].format)\n \n+static int ov5647_write16(struct v4l2_subdev *sd, u16 reg, u16 val)\n+{\n+\tunsigned char data[4] = { reg >> 8, reg & 0xff, val >> 8, val & 0xff};\n+\tstruct i2c_client *client = v4l2_get_subdevdata(sd);\n+\tint ret;\n+\n+\tret = i2c_master_send(client, data, 4);\n+\tif (ret < 0) {\n+\t\tdev_dbg(&client->dev, \"%s: i2c write error, reg: %x\\n\",\n+\t\t\t__func__, reg);\n+\t\treturn ret;\n+\t}\n+\n+\treturn 0;\n+}\n+\n static int ov5647_write(struct v4l2_subdev *sd, u16 reg, u8 val)\n {\n \tunsigned char data[3] = { reg >> 8, reg & 0xff, val};\n@@ -1116,6 +1142,11 @@ static int ov5647_set_pad_fmt(struct v4l2_subdev *sd,\n \thblank = mode->hts - mode->format.width;\n \t__v4l2_ctrl_modify_range(sensor->hblank, hblank, hblank, 1, hblank);\n \n+\t__v4l2_ctrl_modify_range(sensor->vblank, OV5647_VBLANK_MIN,\n+\t\t\t\t OV5647_VTS_MAX - mode->format.height,\n+\t\t\t\t 1, mode->vts - mode->format.height);\n+\t__v4l2_ctrl_s_ctrl(sensor->vblank, mode->vts - mode->format.height);\n+\n \t*fmt = mode->format;\n \tmutex_unlock(&sensor->lock);\n \n@@ -1323,6 +1354,9 @@ static int ov5647_s_ctrl(struct v4l2_ctrl *ctrl)\n \tcase V4L2_CID_HBLANK:\n \t\t/* Read-only, but we adjust it based on mode. */\n \t\treturn 0;\n+\tcase V4L2_CID_VBLANK:\n+\t\treturn ov5647_write16(sd, OV5647_REG_VTS_HI,\n+\t\t\t\t sensor->mode->format.height + ctrl->val);\n \tdefault:\n \t\tdev_info(&client->dev,\n \t\t\t \"Control (id:0x%x, val:0x%x) not supported\\n\",\n@@ -1342,7 +1376,7 @@ static int ov5647_init_controls(struct ov5647 *sensor)\n \tstruct i2c_client *client = v4l2_get_subdevdata(&sensor->sd);\n \tint hblank;\n \n-\tv4l2_ctrl_handler_init(&sensor->ctrls, 7);\n+\tv4l2_ctrl_handler_init(&sensor->ctrls, 8);\n \n \tv4l2_ctrl_new_std(&sensor->ctrls, &ov5647_ctrl_ops,\n \t\t\t V4L2_CID_AUTOGAIN, 0, 1, 1, 0);\n@@ -1381,6 +1415,12 @@ static int ov5647_init_controls(struct ov5647 *sensor)\n \t\tgoto handler_free;\n \tsensor->hblank->flags |= V4L2_CTRL_FLAG_READ_ONLY;\n \n+\tsensor->vblank = v4l2_ctrl_new_std(&sensor->ctrls, &ov5647_ctrl_ops,\n+\t\t\t\t\t V4L2_CID_VBLANK, OV5647_VBLANK_MIN,\n+\t\t\t\t\t OV5647_VTS_MAX - sensor->mode->format.height,\n+\t\t\t\t\t 1, sensor->mode->vts -\n+\t\t\t\t\t sensor->mode->format.height);\n+\n \tif (sensor->ctrls.error)\n \t\tgoto handler_free;\n \n","prefixes":["libcamera-devel","24/25"]}