From patchwork Thu Oct 3 10:31:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomi Valkeinen X-Patchwork-Id: 13820850 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id F3452CF8577 for ; Thu, 3 Oct 2024 10:35:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=Qrs2P5OJlmr0lgBiFqTQyhVZyN18HkIExX3lKJ6sUb0=; b=IphBbueTPrlWr+DpOhaV5uNdXn KYF6yIbb2hgGklTjcSNL9IdLA2/t47AM3j0Z8aQQQlABEurizKBmaNlm8M3cfPEu0NBs9EgQhS3mv v6lL4qiyNpzClL3/j/vufvhRfQfRj73bFzbMfIRKRuvnQSIBqSTc2fzjFqlpI0iYfz37P2OtNbwW9 +o+9VZViNLdDzsCXBW/pdlPixlXLq+m5bsFBkrfPDWGTzjqgefnwSlNXCtLT54HCQGy6XX+WGjlOe pYqICtrRLRztZGh6Lg0r6e9FRjmH7xtCcSAKdG+spjb7oOzSL1z5b1Ep4/l0VLVbhAGzDze9Rcf5i UBcjpvaQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1swJAv-00000008nWR-2IHh; Thu, 03 Oct 2024 10:35:13 +0000 Received: from perceval.ideasonboard.com ([213.167.242.64]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1swJ7X-00000008mv8-4A45; Thu, 03 Oct 2024 10:31:46 +0000 Received: from [127.0.1.1] (91-156-87-48.elisa-laajakaista.fi [91.156.87.48]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 93BD04C7; Thu, 3 Oct 2024 12:30:06 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1727951407; bh=bn7hb6abGotN+zJtZ8HsRWN0WBNQG9WEsGLPob3ZvdA=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=qA5j9RuH/Ax0TG6SIDxsrB1qEIBnXSiYADg3rcsDXBCvBQ256bwfOsPlYTNXJzeds QvLtEcS0JlfcNalmSvauk/+L1kYhySWKsygu9eon4KUb+Fpo5hsiVKufDuBMoQX9+a 0gl1BRVtLMtv8wOhlXnKtbyQut15ofqKl23MqnW0= From: Tomi Valkeinen Date: Thu, 03 Oct 2024 13:31:10 +0300 Subject: [PATCH v6 1/4] media: uapi: Add meta formats for PiSP FE config and stats MIME-Version: 1.0 Message-Id: <20241003-rp1-cfe-v6-1-d6762edd98a8@ideasonboard.com> References: <20241003-rp1-cfe-v6-0-d6762edd98a8@ideasonboard.com> In-Reply-To: <20241003-rp1-cfe-v6-0-d6762edd98a8@ideasonboard.com> To: Mauro Carvalho Chehab , Raspberry Pi Kernel Maintenance , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Florian Fainelli , Broadcom internal kernel review list , Rob Herring , Krzysztof Kozlowski Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Naushir Patuck , Laurent Pinchart , Sakari Ailus , Jacopo Mondi , Kieran Bingham , Tomi Valkeinen X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=4361; i=tomi.valkeinen@ideasonboard.com; h=from:subject:message-id; bh=bn7hb6abGotN+zJtZ8HsRWN0WBNQG9WEsGLPob3ZvdA=; b=owEBbQKS/ZANAwAIAfo9qoy8lh71AcsmYgBm/nKIORtwV9dG2ttDTg2RtyiPDwkjfOjhPAeC3 QXq4t0sSAuJAjMEAAEIAB0WIQTEOAw+ll79gQef86f6PaqMvJYe9QUCZv5yiAAKCRD6PaqMvJYe 9VAHD/45zCCrOQGUFjFgTtu502pwN+Dag7IFVFY/HyE4Zwz4vIcGfIcd/mPlzsls/AjPkmUa5FV vS6FphXP0X9HfjZ0vN15SRKgerlx0FRhH+PyNRTHiTdPqye6L1V7d3w3kAeYbC1RqnBpazPXyS6 e3MrGvXNOcJyhVLvGUum8bn0xQl/YQLTDff1KYCuycORHg8mDDMOBJMf2Z6Obc1dT3Wli5WMa70 JS6SdBAS/JMmLlxk9HbiQMzJKVXYPMI9khfcXuURQheNtthJPMs4AA3LSoK5aI+Y3pv7zLw2kXg DV7jWjj8JGnVrVAmvb15nr2fHCcehEHzczuRaIF3nuyzu5ltLIV0liHq4Hh/FvDR24NuZ/NtXtm RXARMlNWgWwb4zFSmAi+JVNVb3eM7dM6SPfJU54Pk3lnC8/UWA62dYUzdfBaesNY6omYsO4jAvq QQxB1B5xJwkGxN7NgIvKVMUYDebNF/1CruZNbSsUfQgI5yOuSLlwQy1uBAbp8iv5yH/c0nYFaAp XjjvWjym1RuX6DhCyxz+qC6dUx6u14qTNRdb6TzhRt5G7Wf4bM/9G33E0BLLjph0XrJTLJwfa0o 9n2NuimO+1fetjteKCv3LkBPMM04uv90MRolpMDoOFa1oWlz0dNrPqNAiYGSVRvb8NuNCpVzGdY dBR/MU6QNEEPRYw== X-Developer-Key: i=tomi.valkeinen@ideasonboard.com; a=openpgp; fpr=C4380C3E965EFD81079FF3A7FA3DAA8CBC961EF5 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241003_033144_295458_E25D0BDB X-CRM114-Status: GOOD ( 15.28 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Add two meta formats for PiSP FE: V4L2_META_FMT_RPI_FE_CFG and V4L2_META_FMT_RPI_FE_STATS. The former is used to provide configuration for the FE and the latter is used to read the statistics from the FE. Signed-off-by: Tomi Valkeinen --- .../userspace-api/media/v4l/meta-formats.rst | 1 + .../userspace-api/media/v4l/metafmt-pisp-fe.rst | 39 ++++++++++++++++++++++ drivers/media/v4l2-core/v4l2-ioctl.c | 2 ++ include/uapi/linux/videodev2.h | 2 ++ 4 files changed, 44 insertions(+) diff --git a/Documentation/userspace-api/media/v4l/meta-formats.rst b/Documentation/userspace-api/media/v4l/meta-formats.rst index c6e56b5888bc..86ffb3bc8ade 100644 --- a/Documentation/userspace-api/media/v4l/meta-formats.rst +++ b/Documentation/userspace-api/media/v4l/meta-formats.rst @@ -16,6 +16,7 @@ These formats are used for the :ref:`metadata` interface only. metafmt-generic metafmt-intel-ipu3 metafmt-pisp-be + metafmt-pisp-fe metafmt-rkisp1 metafmt-uvc metafmt-vivid diff --git a/Documentation/userspace-api/media/v4l/metafmt-pisp-fe.rst b/Documentation/userspace-api/media/v4l/metafmt-pisp-fe.rst new file mode 100644 index 000000000000..fddeada83e4a --- /dev/null +++ b/Documentation/userspace-api/media/v4l/metafmt-pisp-fe.rst @@ -0,0 +1,39 @@ +.. SPDX-License-Identifier: GPL-2.0 + +.. _v4l2-meta-fmt-rpi-fe-cfg: + +************************ +V4L2_META_FMT_RPI_FE_CFG +************************ + +Raspberry Pi PiSP Front End configuration format +================================================ + +The Raspberry Pi PiSP Front End image signal processor is configured by +userspace by providing a buffer of configuration parameters to the +`rp1-cfe-fe-config` output video device node using the +:c:type:`v4l2_meta_format` interface. + +The `Raspberry Pi PiSP technical specification +`_ +provide detailed description of the Front End configuration and programming +model. + +.. _v4l2-meta-fmt-rpi-fe-stats: + +************************** +V4L2_META_FMT_RPI_FE_STATS +************************** + +Raspberry Pi PiSP Front End statistics format +============================================= + +The Raspberry Pi PiSP Front End image signal processor provides statistics data +by writing to a buffer provided via the `rp1-cfe-fe-stats` capture video device +node using the +:c:type:`v4l2_meta_format` interface. + +The `Raspberry Pi PiSP technical specification +`_ +provide detailed description of the Front End configuration and programming +model. diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c index 5eb4d797d259..95c2c4a97966 100644 --- a/drivers/media/v4l2-core/v4l2-ioctl.c +++ b/drivers/media/v4l2-core/v4l2-ioctl.c @@ -1466,6 +1466,8 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt) case V4L2_PIX_FMT_Y212: descr = "12-bit YUYV Packed"; break; case V4L2_PIX_FMT_Y216: descr = "16-bit YUYV Packed"; break; case V4L2_META_FMT_RPI_BE_CFG: descr = "RPi PiSP BE Config format"; break; + case V4L2_META_FMT_RPI_FE_CFG: descr = "RPi PiSP FE Config format"; break; + case V4L2_META_FMT_RPI_FE_STATS: descr = "RPi PiSP FE Statistics format"; break; case V4L2_META_FMT_GENERIC_8: descr = "8-bit Generic Metadata"; break; case V4L2_META_FMT_GENERIC_CSI2_10: descr = "8-bit Generic Meta, 10b CSI-2"; break; case V4L2_META_FMT_GENERIC_CSI2_12: descr = "8-bit Generic Meta, 12b CSI-2"; break; diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h index 4e91362da6da..9f68cd55248f 100644 --- a/include/uapi/linux/videodev2.h +++ b/include/uapi/linux/videodev2.h @@ -857,6 +857,8 @@ struct v4l2_pix_format { /* Vendor specific - used for RaspberryPi PiSP */ #define V4L2_META_FMT_RPI_BE_CFG v4l2_fourcc('R', 'P', 'B', 'C') /* PiSP BE configuration */ +#define V4L2_META_FMT_RPI_FE_CFG v4l2_fourcc('R', 'P', 'F', 'C') /* PiSP FE configuration */ +#define V4L2_META_FMT_RPI_FE_STATS v4l2_fourcc('R', 'P', 'F', 'S') /* PiSP FE stats */ #ifdef __KERNEL__ /*