From patchwork Thu Dec 11 09:07:26 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jacopo Mondi X-Patchwork-Id: 25483 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 3BFFFBD1F1 for ; Thu, 11 Dec 2025 09:07:45 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id E079F615A7; Thu, 11 Dec 2025 10:07:41 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="oZfhbvCQ"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id A5DD561592 for ; Thu, 11 Dec 2025 10:07:34 +0100 (CET) Received: from [192.168.1.104] (93-46-82-201.ip106.fastwebnet.it [93.46.82.201]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 5EC9E1661; Thu, 11 Dec 2025 10:07:32 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1765444052; bh=QkfWMgRn+4DwXZRMzSEfi5Unxt3Gye96qfF9siT/gpo=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=oZfhbvCQud0ukaxXMWYP9rwFY7lzIUlKW+levA0QpXCTjSjYbyt9AixEZhDdr8ROS cJhcrWfql/olHBDRuCS0sYcRB5dvglCQecwonQk4JLUuunjwrQDuCaxAxqyEt0rjoL y3zvQqfU4V0JVQipSu0+ralc8TCsYmhcwK6ZSyuI= From: Jacopo Mondi Date: Thu, 11 Dec 2025 10:07:26 +0100 Subject: [PATCH v3 3/6] include: linux: media-bus-format.h: Update to v6.18 MIME-Version: 1.0 Message-Id: <20251211-headers-update-v6-18-v3-3-31a54230a104@ideasonboard.com> References: <20251211-headers-update-v6-18-v3-0-31a54230a104@ideasonboard.com> In-Reply-To: <20251211-headers-update-v6-18-v3-0-31a54230a104@ideasonboard.com> To: libcamera-devel@lists.libcamera.org Cc: Jacopo Mondi , =?utf-8?b?QmFybmFiw6Fz?= =?utf-8?q?_P=C5=91cze?= , Laurent Pinchart X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2006; i=jacopo.mondi@ideasonboard.com; h=from:subject:message-id; bh=QkfWMgRn+4DwXZRMzSEfi5Unxt3Gye96qfF9siT/gpo=; b=owEBbQKS/ZANAwAKAXI0Bo8WoVY8AcsmYgBpOonUSQNBecehb5KsTHrC9OAtr0MdWfOS6YhTM E2rHRnNU8OJAjMEAAEKAB0WIQS1xD1IgJogio9YOMByNAaPFqFWPAUCaTqJ1AAKCRByNAaPFqFW PBW9D/sF2HjxLQDdxJbrCznaIf8/lUt4Vqhj2rzTnTd269goNW1W/Rc0dqIpJLSQxwjze5lW9HD Ttvie0xbC8Bc2FPXxGA/ogvNL9JkPdaugn7EJgMIIel9GrhSkLhQJzPLIsc45B1kCvZkB0q6nL2 MHbvr8ekUKc1/6dkDHBdrBOQ4PjrzWjJSFsycTabiKvJCppgCquz4LRNhh+LHny3P6v0JQXqzs4 2FdZxlx2PmwBehTdaNnSy8J29GhUS3LLiLlhPwrv6Wv5FcOs7Xdm9W4s2zlyxCU75/76lr/ggPd LkN7awlnlb8B0ds8Gn3Eqw1yCNKNkWK4WBrVzi+hoVnFyIcn+WoknHnm8gRHFTDBkDHxMpAVOFi WFruf0OtLfq6icY8V9/1auBNZO/c3eX/bAzFSlPeYZjlOkkQrfnLQUaq554VATV5kNDyVC3c+jU aAG9gpVILmmv4qiaYj7Qk+hkH2BhSJa/qsVA+f8wwVBdtv0PkIICS3Khn25/kg1a1EvrBdcl8h6 8cJ2iqG2xWCkl/GrRPXoOYWVT5rcYBXPpd4px1LVoTeW/ciypAQoxFKwDI6XKuF4p4mqEYJ7/ah LVSzSOh7MbvFksCSSyAbw7zyndgA3kFbmliIREz1cUc/58MASP7By11YRNeO/Zes5hNmRYjs+ai ogeHduJWIt7u/dw== 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" Update media-bus-format.h to Linux kernel version v6.18. Mainline has introduced two new media bus codes whose definition conflicts with the downstream definition of MEDIA_BUS_FMT_RGB202020_1X60. Update the definition of MEDIA_BUS_FMT_RGB202020_1X60 not to conflict with the newly added symbol. MEDIA_BUS_FMT_RGB202020_1X60, which is used by the Mali C55 ISP, will land in v6.19 with value 0x1029, so this change actually aligns the downstream definition with the forthcoming upstream support for Mali C55. Signed-off-by: Jacopo Mondi Acked-by: Barnabás Pőcze Reviewed-by: Laurent Pinchart Reviewed-by: Kieran Bingham --- include/linux/media-bus-format.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/include/linux/media-bus-format.h b/include/linux/media-bus-format.h index bf467168d4651fc93459a943605865d6acf8091d..6903d9bb298b969a9c99199e4541c82ea11bbe5c 100644 --- a/include/linux/media-bus-format.h +++ b/include/linux/media-bus-format.h @@ -34,7 +34,7 @@ #define MEDIA_BUS_FMT_FIXED 0x0001 -/* RGB - next is 0x1027 */ +/* RGB - next is 0x1029 */ #define MEDIA_BUS_FMT_RGB444_1X12 0x1016 #define MEDIA_BUS_FMT_RGB444_2X8_PADHI_BE 0x1001 #define MEDIA_BUS_FMT_RGB444_2X8_PADHI_LE 0x1002 @@ -68,11 +68,13 @@ #define MEDIA_BUS_FMT_ARGB8888_1X32 0x100d #define MEDIA_BUS_FMT_RGB888_1X32_PADHI 0x100f #define MEDIA_BUS_FMT_RGB101010_1X30 0x1018 +#define MEDIA_BUS_FMT_RGB101010_1X7X5_SPWG 0x1026 +#define MEDIA_BUS_FMT_RGB101010_1X7X5_JEIDA 0x1027 #define MEDIA_BUS_FMT_RGB666_1X36_CPADLO 0x1020 #define MEDIA_BUS_FMT_RGB888_1X36_CPADLO 0x1021 #define MEDIA_BUS_FMT_RGB121212_1X36 0x1019 #define MEDIA_BUS_FMT_RGB161616_1X48 0x101a -#define MEDIA_BUS_FMT_RGB202020_1X60 0x1026 +#define MEDIA_BUS_FMT_RGB202020_1X60 0x1029 /* YUV (including grey) - next is 0x202f */ #define MEDIA_BUS_FMT_Y8_1X8 0x2001