{"id":10787,"url":"https://patchwork.libcamera.org/api/patches/10787/?format=json","web_url":"https://patchwork.libcamera.org/patch/10787/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/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":"<20201230230603.123486-3-jacopo@jmondi.org>","date":"2020-12-30T23:05:59","name":"[libcamera-devel,v4,2/6] libcamera: camera_sensor: Validate driver support","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"72facf24b8e61d9bf9befc8b0187f300e533de9c","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/?format=json","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/10787/mbox/","series":[{"id":1561,"url":"https://patchwork.libcamera.org/api/series/1561/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1561","date":"2020-12-30T23:05:57","name":"libcamera: camera_sensor: Make validation more strict","version":4,"mbox":"https://patchwork.libcamera.org/series/1561/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/10787/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/10787/checks/","tags":{},"headers":{"Return-Path":"","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 6BE80C0F1A\n\tfor ;\n\tWed, 30 Dec 2020 23:05:58 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 6C8566200A;\n\tThu, 31 Dec 2020 00:05:57 +0100 (CET)","from relay6-d.mail.gandi.net (relay6-d.mail.gandi.net\n\t[217.70.183.198])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 7638760526\n\tfor ;\n\tThu, 31 Dec 2020 00:05:54 +0100 (CET)","from uno.lan (2-224-242-101.ip172.fastwebnet.it [2.224.242.101])\n\t(Authenticated sender: jacopo@jmondi.org)\n\tby relay6-d.mail.gandi.net (Postfix) with ESMTPSA id D6FE0C0002;\n\tWed, 30 Dec 2020 23:05:53 +0000 (UTC)"],"X-Originating-IP":"2.224.242.101","From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Date":"Thu, 31 Dec 2020 00:05:59 +0100","Message-Id":"<20201230230603.123486-3-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.29.2","In-Reply-To":"<20201230230603.123486-1-jacopo@jmondi.org>","References":"<20201230230603.123486-1-jacopo@jmondi.org>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v4 2/6] libcamera: camera_sensor: Validate\n\tdriver support","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","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"The CameraSensor class requires the sensor driver to report\ninformation through V4L2 controls and through the V4L2 selection API,\nand uses that information to register Camera properties and to\nconstruct CameraSensorInfo class instances to provide them to the IPA.\n\nCurrently, validation of the kernel support happens each time a\nfeature is requested, with slighly similar debug/error messages\noutput to the user in case a feature is not supported.\n\nRationalize this by validating the sensor driver requirements in a\nsingle function\n\nReviewed-by: Laurent Pinchart \nReviewed-by: Paul Elder \nSigned-off-by: Jacopo Mondi \n---\n include/libcamera/internal/camera_sensor.h | 1 +\n src/libcamera/camera_sensor.cpp | 84 ++++++++++++++++++++++\n 2 files changed, 85 insertions(+)","diff":"diff --git a/include/libcamera/internal/camera_sensor.h b/include/libcamera/internal/camera_sensor.h\nindex f80d836161a5..aee10aa6e3c7 100644\n--- a/include/libcamera/internal/camera_sensor.h\n+++ b/include/libcamera/internal/camera_sensor.h\n@@ -69,6 +69,7 @@ protected:\n \n private:\n \tint generateId();\n+\tint validateSensorDriver();\n \tint initProperties();\n \n \tconst MediaEntity *entity_;\ndiff --git a/src/libcamera/camera_sensor.cpp b/src/libcamera/camera_sensor.cpp\nindex e786821d4ba2..048fcd6a1fae 100644\n--- a/src/libcamera/camera_sensor.cpp\n+++ b/src/libcamera/camera_sensor.cpp\n@@ -207,6 +207,10 @@ int CameraSensor::init()\n \t */\n \tresolution_ = sizes_.back();\n \n+\tret = validateSensorDriver();\n+\tif (ret)\n+\t\treturn ret;\n+\n \tret = initProperties();\n \tif (ret)\n \t\treturn ret;\n@@ -214,6 +218,86 @@ int CameraSensor::init()\n \treturn 0;\n }\n \n+int CameraSensor::validateSensorDriver()\n+{\n+\t/*\n+\t * Make sure the sensor driver supports the mandatory controls\n+\t * required by the CameraSensor class.\n+\t * - V4L2_CID_PIXEL_RATE is used to calculate the sensor timings\n+\t * - V4L2_CID_HBLANK is used to calculate the line length\n+\t */\n+\tconst std::vector mandatoryControls{\n+\t\tV4L2_CID_PIXEL_RATE,\n+\t\tV4L2_CID_HBLANK,\n+\t};\n+\n+\tControlList ctrls = subdev_->getControls(mandatoryControls);\n+\tif (ctrls.empty()) {\n+\t\tLOG(CameraSensor, Error)\n+\t\t\t<< \"Mandatory V4L2 controls not available\";\n+\t\tLOG(CameraSensor, Error)\n+\t\t\t<< \"The sensor kernel driver needs to be fixed\";\n+\t\tLOG(CameraSensor, Error)\n+\t\t\t<< \"See Documentation/sensor_driver_requirements.rst in the libcamera sources for more information\";\n+\t\treturn -EINVAL;\n+\t}\n+\n+\t/*\n+\t * Optional controls are used to register optional sensor properties. If\n+\t * not present, some values will be defaulted.\n+\t */\n+\tconst std::vector optionalControls{\n+\t\tV4L2_CID_CAMERA_ORIENTATION,\n+\t\tV4L2_CID_CAMERA_SENSOR_ROTATION,\n+\t};\n+\n+\tctrls = subdev_->getControls(optionalControls);\n+\tif (ctrls.empty())\n+\t\tLOG(CameraSensor, Debug) << \"Optional V4L2 controls not supported\";\n+\n+\t/*\n+\t * Make sure the required selection targets are supported.\n+\t *\n+\t * Failures in reading any of the targets are not deemed to be fatal,\n+\t * but some properties and features, like constructing a\n+\t * CameraSensorInfo for the IPA module, won't be supported.\n+\t *\n+\t * \\todo Make support for selection targets mandatory as soon as all\n+\t * test platforms have been updated.\n+\t */\n+\tint err = 0;\n+\tRectangle rect;\n+\tint ret = subdev_->getSelection(pad_, V4L2_SEL_TGT_CROP_BOUNDS, &rect);\n+\tif (ret) {\n+\t\tLOG(CameraSensor, Warning)\n+\t\t\t<< \"Failed to retrieve the readable pixel array size\";\n+\t\terr = -EINVAL;\n+\t}\n+\n+\tret = subdev_->getSelection(pad_, V4L2_SEL_TGT_CROP_DEFAULT, &rect);\n+\tif (ret) {\n+\t\tLOG(CameraSensor, Warning)\n+\t\t\t<< \"Failed to retrieve the active pixel array size\";\n+\t\terr = -EINVAL;\n+\t}\n+\n+\tret = subdev_->getSelection(pad_, V4L2_SEL_TGT_CROP, &rect);\n+\tif (ret) {\n+\t\tLOG(CameraSensor, Warning)\n+\t\t\t<< \"Failed to retrieve the sensor crop rectangle\";\n+\t\terr = -EINVAL;\n+\t}\n+\n+\tif (err) {\n+\t\tLOG(CameraSensor, Warning)\n+\t\t\t<< \"The sensor kernel driver needs to be fixed\";\n+\t\tLOG(CameraSensor, Warning)\n+\t\t\t<< \"See Documentation/sensor_driver_requirements.rst in the libcamera sources for more information\";\n+\t}\n+\n+\treturn 0;\n+}\n+\n int CameraSensor::initProperties()\n {\n \t/*\n","prefixes":["libcamera-devel","v4","2/6"]}