Patch Detail
Show a patch.
GET /api/patches/18528/?format=api
{ "id": 18528, "url": "https://patchwork.libcamera.org/api/patches/18528/?format=api", "web_url": "https://patchwork.libcamera.org/patch/18528/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20230406-feature-controls-lens-v1-3-543189a680de@wolfvision.net>", "date": "2023-04-06T14:31:12", "name": "[libcamera-devel,RFC,3/4] media: v4l2-ctrls: add lens calibration controls", "commit_ref": null, "pull_url": null, "state": "not-applicable", "archived": false, "hash": "73692ccff69beb2ded450b47b4231ee836578fbe", "submitter": { "id": 135, "url": "https://patchwork.libcamera.org/api/people/135/?format=api", "name": "Michael Riesch", "email": "michael.riesch@wolfvision.net" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/18528/mbox/", "series": [ { "id": 3837, "url": "https://patchwork.libcamera.org/api/series/3837/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=3837", "date": "2023-04-06T14:31:10", "name": "media: v4l2-ctrls: add controls for complex lens controller devices", "version": 1, "mbox": "https://patchwork.libcamera.org/series/3837/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/18528/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/18528/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "X-Original-To": "parsemail@patchwork.libcamera.org", "Delivered-To": "parsemail@patchwork.libcamera.org", "Received": [ "from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 4B3BDC0F2A\n\tfor <parsemail@patchwork.libcamera.org>;\n\tThu, 6 Apr 2023 14:31:48 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 8762E6279B;\n\tThu, 6 Apr 2023 16:31:46 +0200 (CEST)", "from dfw.source.kernel.org (dfw.source.kernel.org\n\t[IPv6:2604:1380:4641:c500::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 4ECF66278A\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 6 Apr 2023 16:31:42 +0200 (CEST)", "from smtp.kernel.org (relay.kernel.org [52.25.139.140])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby dfw.source.kernel.org (Postfix) with ESMTPS id 1481C645E8;\n\tThu, 6 Apr 2023 14:31:41 +0000 (UTC)", "by smtp.kernel.org (Postfix) with ESMTPS id D4267C433A4;\n\tThu, 6 Apr 2023 14:31:40 +0000 (UTC)", "from aws-us-west-2-korg-lkml-1.web.codeaurora.org\n\t(localhost.localdomain [127.0.0.1])\n\tby smtp.lore.kernel.org (Postfix) with ESMTP id B7277C77B79;\n\tThu, 6 Apr 2023 14:31:40 +0000 (UTC)" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1680791506;\n\tbh=RyDWKy48TsKVtA2Ls0BtoGe0+1BDPQp9L9Bj3QXC1Dw=;\n\th=Date:References:In-Reply-To:To:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc:\n\tFrom;\n\tb=s1bnL7Ucuikt7CYpDiPN9p0z9tdtq9OsgGwFvkDjmPt9VbHlVuulqC8r2UqkJUYzp\n\tfCsEPjMme1cwkyzzGYIZgcDdxUoW/rlDrWAx1PDmZBHD/31vFAta5//O3V/Auij/Oe\n\tLCSM6u3obRIYyJqtq0ssNA+TLS+G2n+fPc/yt1pd/yL9kxQAXsFnPWQ3ArzU2gaXy3\n\tOAPBaqna401X8sddHHt8/ZDhlXdZRWA8i4/GGiKM+Ew2R0dx0ytIx6kiJvNZXCRxKg\n\t2T8BET1/gnqjKHpuidyFBZGpJ3PYz2r/Z67gpnB+zAQzb7LTix3Zq4iauyHuhSKS78\n\tw0Jur6JpuSqRA==", "v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org;\n\ts=k20201202; t=1680791500;\n\tbh=RyDWKy48TsKVtA2Ls0BtoGe0+1BDPQp9L9Bj3QXC1Dw=;\n\th=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From;\n\tb=uYsoSe6rpzG3pYpnJ9YlN16d6uyUzLEbXxCrE+0CsIy0bdv8jwX7gxCb6WxWa88PM\n\t+2PGnckzkuSJtNwmS5tDHYs9nkV8o5WP7KfI45zp6cjqKmVD8pQsdyNuYz6kUqdAW6\n\tWQ/TVDffFcNAi7jcAHxVw/kVzTn0fA5a75o3MNMdCGGbNJoKLpNSzlDaEyNSMdsu61\n\ttfh0QqHxYC4rVWD4TmAjq7+DIQ3lmUypJiMZjZJBlapp3uGkJ9WcQWCuPCY3i3Umzh\n\tKeiJbfn9lFfdpJWi+hDiMmXi/p8gjnwVuY24waBJk/EGVv0wM9wO+CP2dAR38mCDyf\n\tJLacNNxTqLLog==" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (2048-bit key; \n\tunprotected) header.d=kernel.org\n\theader.i=@kernel.org header.b=\"uYsoSe6r\"; \n\tdkim-atps=neutral", "Date": "Thu, 06 Apr 2023 16:31:12 +0200", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=\"utf-8\"", "Content-Transfer-Encoding": "7bit", "Message-Id": "<20230406-feature-controls-lens-v1-3-543189a680de@wolfvision.net>", "References": "<20230406-feature-controls-lens-v1-0-543189a680de@wolfvision.net>", "In-Reply-To": "<20230406-feature-controls-lens-v1-0-543189a680de@wolfvision.net>", "To": "Mauro Carvalho Chehab <mchehab@kernel.org>", "X-Mailer": "b4 0.12.2", "X-Developer-Signature": "v=1; a=ed25519-sha256; t=1680791498; l=4774;\n\ti=michael.riesch@wolfvision.net; s=20230406; h=from:subject:message-id;\n\tbh=xh3oWCYEuxKk813VjgkzcdJVj/4p3Q2RGXeu2ehNS1Q=;\n\tb=HN0AoCiyPKygCIQ1I7KzCH9sjczrGs3Z2VEzTS8xEI2rqm2rc0BcDmI7b5LEd/bfAoiQQFQG6\n\tv4Qi5xwyoSHAGW/dEEDTTh1ZbR/9zJIz/6NBPjEsswAtcvHkITiPqH3", "X-Developer-Key": "i=michael.riesch@wolfvision.net; a=ed25519;\n\tpk=G03kuYHL670EcdsWaNfVA7KnHWmkSpj98XziQm/hjbk=", "X-Endpoint-Received": "by B4 Relay for michael.riesch@wolfvision.net/20230406\n\twith auth_id=38", "X-Original-From": "Michael Riesch <michael.riesch@wolfvision.net>", "Subject": "[libcamera-devel] [PATCH RFC 3/4] media: v4l2-ctrls: add lens\n\tcalibration controls", "X-BeenThere": "libcamera-devel@lists.libcamera.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "From": "Michael Riesch via B4 Relay via libcamera-devel\n\t<libcamera-devel@lists.libcamera.org>", "Reply-To": "michael.riesch@wolfvision.net", "Cc": "Michael Riesch via B4 Relay\n\t<devnull+michael.riesch.wolfvision.net@kernel.org>,\n\tlinux-kernel@vger.kernel.org,\n\tMatthias Fend <Matthias.Fend@wolfvision.net>, \n\tlibcamera-devel@lists.libcamera.org,\n\tSakari Ailus <sakari.ailus@linux.intel.com>, linux-media@vger.kernel.org", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "From: Michael Riesch <michael.riesch@wolfvision.net>\n\nAdd the controls V4L2_CID_LENS_CALIB_CONTROL and V4L2_CID_LENS_CALIB_STATUS\nthat facilitate the control of the lens group calibration procedure.\n\nSigned-off-by: Michael Riesch <michael.riesch@wolfvision.net>\n---\n .../userspace-api/media/v4l/ext-ctrls-camera.rst | 35 ++++++++++++++++++++++\n drivers/media/v4l2-core/v4l2-ctrls-defs.c | 6 ++++\n include/uapi/linux/v4l2-controls.h | 12 ++++++++\n 3 files changed, 53 insertions(+)", "diff": "diff --git a/Documentation/userspace-api/media/v4l/ext-ctrls-camera.rst b/Documentation/userspace-api/media/v4l/ext-ctrls-camera.rst\nindex 5e34515024bd..441467a971ac 100644\n--- a/Documentation/userspace-api/media/v4l/ext-ctrls-camera.rst\n+++ b/Documentation/userspace-api/media/v4l/ext-ctrls-camera.rst\n@@ -297,6 +297,41 @@ enum v4l2_auto_focus_range -\n (V4L2_CID_ZOOM_ABSOLUTE and V4L2_CID_ZOOM_RELATIVE). The unit is\n driver-specific. The value should be a positive integer.\n \n+``V4L2_CID_LENS_CALIB_CONTROL (bitmask)``\n+ Control the calibration procedure (or individual parts thereof) of the lens\n+ groups. For example, this could include the mechanical range detection\n+ of zoom lens motors. This is a write-only control.\n+\n+.. tabularcolumns:: |p{6.8cm}|p{10.7cm}|\n+\n+.. flat-table::\n+ :header-rows: 0\n+ :stub-columns: 0\n+\n+ * - ``V4L2_LENS_CALIB_STOP``\n+ - Stop the lens calibration procedure.\n+ * - ``V4L2_LENS_CALIB_START``\n+ - Start the complete lens calibration procedure.\n+\n+``V4L2_CID_LENS_CALIB_CONTROL (bitmask)``\n+ The status of the calibration procedure (or individual parts thereof) of\n+ the lens groups. This is a read-only control.\n+\n+.. tabularcolumns:: |p{6.8cm}|p{10.7cm}|\n+\n+.. flat-table::\n+ :header-rows: 0\n+ :stub-columns: 0\n+\n+ * - ``V4L2_LENS_CALIB_IDLE``\n+ - Lens calibration procedure has not yet been started.\n+ * - ``V4L2_LENS_CALIB_BUSY``\n+ - Lens calibration procedure is in progress.\n+ * - ``V4L2_LENS_CALIB_COMPLETE``\n+ - Lens calibration procedure is complete.\n+ * - ``V4L2_LENS_CALIB_FAILED``\n+ - Lens calibration procedure has failed.\n+\n ``V4L2_CID_IRIS_ABSOLUTE (integer)``\n This control sets the camera's aperture to the specified value. The\n unit is undefined. Larger values open the iris wider, smaller values\ndiff --git a/drivers/media/v4l2-core/v4l2-ctrls-defs.c b/drivers/media/v4l2-core/v4l2-ctrls-defs.c\nindex 2c21bcccc6ee..382abf6be9de 100644\n--- a/drivers/media/v4l2-core/v4l2-ctrls-defs.c\n+++ b/drivers/media/v4l2-core/v4l2-ctrls-defs.c\n@@ -1048,6 +1048,8 @@ const char *v4l2_ctrl_get_name(u32 id)\n \tcase V4L2_CID_ZOOM_STATUS:\t\treturn \"Zoom, Status\";\n \tcase V4L2_CID_FOCUS_SPEED:\t\treturn \"Focus, Speed\";\n \tcase V4L2_CID_ZOOM_SPEED:\t\treturn \"Zoom, Speed\";\n+\tcase V4L2_CID_LENS_CALIB_CONTROL:\treturn \"Lens Calibration, Control\";\n+\tcase V4L2_CID_LENS_CALIB_STATUS:\treturn \"Lens Calibration, Status\";\n \n \t/* FM Radio Modulator controls */\n \t/* Keep the order of the 'case's the same as in v4l2-controls.h! */\n@@ -1594,6 +1596,7 @@ void v4l2_ctrl_fill(u32 id, const char **name, enum v4l2_ctrl_type *type,\n \tcase V4L2_CID_FOCUS_RELATIVE:\n \tcase V4L2_CID_IRIS_RELATIVE:\n \tcase V4L2_CID_ZOOM_RELATIVE:\n+\tcase V4L2_CID_LENS_CALIB_CONTROL:\n \t\t*flags |= V4L2_CTRL_FLAG_WRITE_ONLY |\n \t\t\t V4L2_CTRL_FLAG_EXECUTE_ON_WRITE;\n \t\tbreak;\n@@ -1602,6 +1605,9 @@ void v4l2_ctrl_fill(u32 id, const char **name, enum v4l2_ctrl_type *type,\n \t\t*type = V4L2_CTRL_TYPE_LENS_STATUS;\n \t\t*flags |= V4L2_CTRL_FLAG_READ_ONLY | V4L2_CTRL_FLAG_VOLATILE;\n \t\tbreak;\n+\tcase V4L2_CID_LENS_CALIB_STATUS:\n+\t\t*flags |= V4L2_CTRL_FLAG_READ_ONLY | V4L2_CTRL_FLAG_VOLATILE;\n+\t\tbreak;\n \tcase V4L2_CID_FLASH_STROBE_STATUS:\n \tcase V4L2_CID_AUTO_FOCUS_STATUS:\n \tcase V4L2_CID_FLASH_READY:\ndiff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linux/v4l2-controls.h\nindex fecce641d0d8..34601ad1213a 100644\n--- a/include/uapi/linux/v4l2-controls.h\n+++ b/include/uapi/linux/v4l2-controls.h\n@@ -1008,6 +1008,18 @@ struct v4l2_ctrl_lens_status {\n #define V4L2_CID_FOCUS_SPEED\t\t\t(V4L2_CID_CAMERA_CLASS_BASE + 39)\n #define V4L2_CID_ZOOM_SPEED\t\t\t(V4L2_CID_CAMERA_CLASS_BASE + 40)\n \n+#define V4L2_LENS_CALIB_STOP\t\t\t(0 << 0)\n+#define V4L2_LENS_CALIB_START\t\t\t(1 << 0)\n+\n+#define V4L2_CID_LENS_CALIB_CONTROL\t\t(V4L2_CID_CAMERA_CLASS_BASE + 41)\n+\n+#define V4L2_LENS_CALIB_IDLE\t\t\t(0 << 0)\n+#define V4L2_LENS_CALIB_BUSY\t\t\t(1 << 0)\n+#define V4L2_LENS_STATUS_COMPLETE\t\t(1 << 1)\n+#define V4L2_LENS_STATUS_FAILED\t\t\t(1 << 2)\n+\n+#define V4L2_CID_LENS_CALIB_STATUS\t\t(V4L2_CID_CAMERA_CLASS_BASE + 42)\n+\n /* FM Modulator class control IDs */\n \n #define V4L2_CID_FM_TX_CLASS_BASE\t\t(V4L2_CTRL_CLASS_FM_TX | 0x900)\n", "prefixes": [ "libcamera-devel", "RFC", "3/4" ] }