From patchwork Thu Dec 4 15:54:16 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacopo Mondi X-Patchwork-Id: 25351 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 A2753BD80A for ; Thu, 4 Dec 2025 15:54:45 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id D5A9261160; Thu, 4 Dec 2025 16:54:44 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="ufhKsiNY"; 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 E737D610AA for ; Thu, 4 Dec 2025 16:54:39 +0100 (CET) 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 EA3BB122A; Thu, 4 Dec 2025 16:52:22 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1764863543; bh=k//PMcWv5HvaokhzkRDzYIOWl3VOfnrpLxli4ARKdzI=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=ufhKsiNYwv+7ilIHRTUKTnOpuJGGy5kOHMFcBb65BlYI3GVJoP7hUZk6XdRIKiLGT r9qQN3df5hkVHCQ2yWILStzyqa5eepFvpOwB2iG02XwtJ1KMg0qgctAFYt7+jeBkmb aR+nCx2pU5K+EQmgYbbBIypsL0BrK4ZryouZ3RXo= From: Jacopo Mondi Date: Thu, 04 Dec 2025 16:54:16 +0100 Subject: [PATCH 3/6] include: linux: media-bus-format.h: Update to v6.18 MIME-Version: 1.0 Message-Id: <20251204-headers-update-v6-18-v1-3-93135d14a081@ideasonboard.com> References: <20251204-headers-update-v6-18-v1-0-93135d14a081@ideasonboard.com> In-Reply-To: <20251204-headers-update-v6-18-v1-0-93135d14a081@ideasonboard.com> To: libcamera-devel@lists.libcamera.org Cc: Jacopo Mondi X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1877; i=jacopo.mondi@ideasonboard.com; h=from:subject:message-id; bh=k//PMcWv5HvaokhzkRDzYIOWl3VOfnrpLxli4ARKdzI=; b=owEBbQKS/ZANAwAKAXI0Bo8WoVY8AcsmYgBpMa68x7U+vulvkCIEKCmoAuZsZadOTuFhKb0jM Ocvg1V3ZqmJAjMEAAEKAB0WIQS1xD1IgJogio9YOMByNAaPFqFWPAUCaTGuvAAKCRByNAaPFqFW PB7hD/97uOZ6p8CvKsdLTl0Viyk46cdQz5AXg67CZtmGfOGSRzOdlrvftfCSk7baM62AYPul5IH C6BbEYt3cfiZyTvuRgIgo/n40yFKZcsaXhQ7/F/oVozEVKJHb1JTBat7Tih6NPrMdaSnGmES+BC 4EjjWY6KvXmkRC5tQlRaFwpKSJVrxi7g9sAuUY55N3HkhRnpruwoZd+e2rFd9t/MVN94XS3NPhM 24aNyXJ8IJoo72WPz8PTX+Zk5q18Fhifkym7BsQF0gDzM0QOGSN+SYmzcrYfF1Kcx+rAuRKbEsA CYUPGm2xhJF8VolnVS/2AAlfmmUJiGOtj/Xj11IJTXzIUN0ImJwxBnA6ByhsKyNzLX465J0VgwJ kJ2zybmkD2JHL3jYWR6m1Y2YY0UO4oEFDXe6rMpYWODEd4vxEWGIhxoWJwUu0LXchBygt3Tvakm 9pSiSsOpdWrL1LROecYeJ/S+HLeaqFqmJfSz1Q57uW5t7PTIPZ/E/Hyd6gftiSX1+2PBaK0eH2R Am/rUEsd7CCzLYBZouhrVGxtqW5gyxyujDxbCKDDisAJpKz2KvTfYjymXp5/9/1nk/UWeLaq1Tu MSSjLBnusaRp9QflmzxWY5sMOWmLcY6j5pXaWB1BLfd8rDZryhCQ57X3pwC/1o9Cve+9qT5/yST x77CDauVqgDlEjQ== 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 --- 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