From patchwork Tue Oct 14 10:55:37 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacopo Mondi X-Patchwork-Id: 24631 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 07AC3C3264 for ; Tue, 14 Oct 2025 10:55:56 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id D450A605EC; Tue, 14 Oct 2025 12:55:55 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="YtNgpXhi"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 8F2F4605E4 for ; Tue, 14 Oct 2025 12:55:52 +0200 (CEST) Received: from [192.168.1.182] (93-46-82-201.ip106.fastwebnet.it [93.46.82.201]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 92512E70; Tue, 14 Oct 2025 12:54:12 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1760439252; bh=B04XQR2HsXyiHyqtqII3W7XT9inNJ/kKeKMlTQUnZ0Q=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=YtNgpXhiPe8C7nPxPCOHlshugem2zw5kExb2jDMDWR5HGcEy0HGaawAKipZPmymdH ZuhJkYK6nOvOcZXNcO+E8l8xO7eYPhe5pZ2mYkGejd6BNGVQwM3jA7GbVnA5eowW39 ArXrS5t/yLF+Zxu16X+SUIIslcT8iCEoKEbeifiE= From: Jacopo Mondi Date: Tue, 14 Oct 2025 12:55:37 +0200 Subject: [PATCH v6 2/5] include: linux: Add v4l2-isp.h MIME-Version: 1.0 Message-Id: <20251014-v4l2-params-v6-2-caf5fa69eb29@ideasonboard.com> References: <20251014-v4l2-params-v6-0-caf5fa69eb29@ideasonboard.com> In-Reply-To: <20251014-v4l2-params-v6-0-caf5fa69eb29@ideasonboard.com> To: libcamera-devel@lists.libcamera.org Cc: Jacopo Mondi , Antoine Bouyer , Laurent Pinchart , Kieran Bingham , Daniel Scally X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=5849; i=jacopo.mondi@ideasonboard.com; h=from:subject:message-id; bh=B04XQR2HsXyiHyqtqII3W7XT9inNJ/kKeKMlTQUnZ0Q=; b=owEBbQKS/ZANAwAKAXI0Bo8WoVY8AcsmYgBo7iw15AMIh7D0Q0L1oqmgrkXFgPnTcSdleNwQg DuYqN67MO6JAjMEAAEKAB0WIQS1xD1IgJogio9YOMByNAaPFqFWPAUCaO4sNQAKCRByNAaPFqFW PI4aD/9My1oXnu04Ke6JDMW+QdiUkEUKfJtmhfIZJGqIPJYfFvWh8Jffz3K8NKEXu+HGs4fw0S4 iC7gZb3XnBda1mWey1HqSUUy4qTrzfkTV04FDZhzR66eiq2x3SuUFWS6+WEaoakxH+/vQE1nh44 s+9Uu+Dw6yH+X+lcX5u8R/UgTz/9jaM5UQ5gAryPfWAb0hLPTANuLVIiyZKGXecWFGp8au4FkqF xcM2KIrrECj047//qiOA74fVfPN9F/bucdF6T5wJGwZmx/1w+WPQy8JnWno8hPxryX+MSu1huGK SbpeBUysdGJ4oeie84UI4Jz9Vqp9p1khz7rIMTpwyduln0xFIlVj2XAPe8bx4G5uPLCYjgPzo8z qib2zvwQnBs8oaOZSzR+G5dKdrNUUnxC6WCDaEj5Q5LX9csm1DkBsBb20DFC878H0R3UAN4au10 eHfMoYMBOjBGR4TVovx4+H+R9brrQwKMJuiSmQZEVy+DeATOmeOFqGAXTMrzMxrJH4hhzTIa0d7 xKlalSLhpey0xJ5+0RRbkol6rlWFN/Pou9KRytd48raU/dF2hjDYcRBYO2RnSKXf5NXQQdl9tUE GRNY+TM8Y5jAjfAW1VBIE2iAKmksAPAqGSRlc0xw3/oEWzxnuvsSfNrpiy9QK4WP0+Yjc/Tz0JD UutKFtYLU9EeTUg== X-Developer-Key: i=jacopo.mondi@ideasonboard.com; a=openpgp; fpr=72392EDC88144A65C701EA9BA5826A2587AD026B X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Import the v4l2-isp.h header from the Linux kernel sources. The file has not been merged in mainline Linux yet but is available at v7: https://lore.kernel.org/all/20251014-extensible-parameters-validation-v7-0-6628bed5ca98@ideasonboard.com/ Create the include/linux/media/ directory so that header files exported from the kernel which include this file do not need to be adjusted when imported in libcamera. Signed-off-by: Jacopo Mondi Tested-by: Antoine Bouyer Reviewed-by: Laurent Pinchart Acked-by: Kieran Bingham Reviewed-by: Daniel Scally --- include/linux/media/v4l2-isp.h | 102 +++++++++++++++++++++++++++++++++++++++++ utils/update-kernel-headers.sh | 1 + 2 files changed, 103 insertions(+) diff --git a/include/linux/media/v4l2-isp.h b/include/linux/media/v4l2-isp.h new file mode 100644 index 0000000000000000000000000000000000000000..0cfc4ab94967ae796e9d9fc755dbbe072c1e82e2 --- /dev/null +++ b/include/linux/media/v4l2-isp.h @@ -0,0 +1,102 @@ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * Video4Linux2 generic ISP parameters and statistics support + * + * Copyright (C) 2025 Ideas On Board Oy + * Author: Jacopo Mondi + */ + +#ifndef _V4L2_ISP_H_ +#define _V4L2_ISP_H_ + +#include +#include + +/** + * enum v4l2_isp_params_version - V4L2 ISP parameters versioning + * + * @V4L2_ISP_PARAMS_VERSION_V0: First version of the V4L2 ISP parameters format + * (for compatibility) + * @V4L2_ISP_PARAMS_VERSION_V1: First version of the V4L2 ISP parameters format + * + * V0 and V1 are identical in order to support drivers compatible with the V4L2 + * ISP parameters format already upstreamed which use either 0 or 1 as their + * versioning identifier. Both V0 and V1 refers to the first version of the + * V4L2 ISP parameters format. + * + * Future revisions of the V4L2 ISP parameters format should start from the + * value of 2. + */ +enum v4l2_isp_params_version { + V4L2_ISP_PARAMS_VERSION_V0 = 0, + V4L2_ISP_PARAMS_VERSION_V1 +}; + +#define V4L2_ISP_PARAMS_FL_BLOCK_DISABLE (1U << 0) +#define V4L2_ISP_PARAMS_FL_BLOCK_ENABLE (1U << 1) + +/* + * Reserve the first 8 bits for V4L2_ISP_PARAMS_FL_* flag. + * + * Driver-specific flags should be defined as: + * #define DRIVER_SPECIFIC_FLAG0 ((1U << V4L2_ISP_PARAMS_FL_DRIVER_FLAGS(0)) + * #define DRIVER_SPECIFIC_FLAG1 ((1U << V4L2_ISP_PARAMS_FL_DRIVER_FLAGS(1)) + */ +#define V4L2_ISP_PARAMS_FL_DRIVER_FLAGS(n) ((n) + 8) + +/** + * struct v4l2_isp_params_block_header - V4L2 extensible parameters block header + * @type: The parameters block type (driver-specific) + * @flags: A bitmask of block flags (driver-specific) + * @size: Size (in bytes) of the parameters block, including this header + * + * This structure represents the common part of all the ISP configuration + * blocks. Each parameters block shall embed an instance of this structure type + * as its first member, followed by the block-specific configuration data. + * + * The @type field is an ISP driver-specific value that identifies the block + * type. The @size field specifies the size of the parameters block. + * + * The @flags field is a bitmask of per-block flags V4L2_PARAMS_ISP_FL_* and + * driver-specific flags specified by the driver header. + */ +struct v4l2_isp_params_block_header { + __u16 type; + __u16 flags; + __u32 size; +} __attribute__((aligned(8))); + +/** + * struct v4l2_isp_params_buffer - V4L2 extensible parameters configuration + * @version: The parameters buffer version (driver-specific) + * @data_size: The configuration data effective size, excluding this header + * @data: The configuration data + * + * This structure contains the configuration parameters of the ISP algorithms, + * serialized by userspace into a data buffer. Each configuration parameter + * block is represented by a block-specific structure which contains a + * :c:type:`v4l2_isp_params_block_header` entry as first member. Userspace + * populates the @data buffer with configuration parameters for the blocks that + * it intends to configure. As a consequence, the data buffer effective size + * changes according to the number of ISP blocks that userspace intends to + * configure and is set by userspace in the @data_size field. + * + * The parameters buffer is versioned by the @version field to allow modifying + * and extending its definition. Userspace shall populate the @version field to + * inform the driver about the version it intends to use. The driver will parse + * and handle the @data buffer according to the data layout specific to the + * indicated version and return an error if the desired version is not + * supported. + * + * For each ISP block that userspace wants to configure, a block-specific + * structure is appended to the @data buffer, one after the other without gaps + * in between. Userspace shall populate the @data_size field with the effective + * size, in bytes, of the @data buffer. + */ +struct v4l2_isp_params_buffer { + __u32 version; + __u32 data_size; + __u8 data[] __counted_by(data_size); +}; + +#endif /* _V4L2_ISP_H_ */ diff --git a/utils/update-kernel-headers.sh b/utils/update-kernel-headers.sh index 666624f9972ea61067e5b5695237ab7a17c61664..749c9e0345e7b8f40fece720a3fbfcd428eeab7f 100755 --- a/utils/update-kernel-headers.sh +++ b/utils/update-kernel-headers.sh @@ -51,6 +51,7 @@ headers=" linux/dma-heap.h linux/media-bus-format.h linux/media.h + linux/media/v4l2-isp.h linux/rkisp1-config.h linux/stddef.h linux/udmabuf.h