From patchwork Wed Dec 10 08:19:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jacopo Mondi X-Patchwork-Id: 25447 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 C58EAC3257 for ; Wed, 10 Dec 2025 08:19:35 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 0E42D6143D; Wed, 10 Dec 2025 09:19:35 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="hmvcETe/"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 56ACB61428 for ; Wed, 10 Dec 2025 09:19:28 +0100 (CET) Received: from [192.168.1.106] (mob-5-90-63-16.net.vodafone.it [5.90.63.16]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 0AB451864; Wed, 10 Dec 2025 09:19:26 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1765354767; bh=aEE+jrxRZGA7X0MR1pQTPdh9uYi8cwf+EHdC42VdsHI=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=hmvcETe/cx2x8aDOaRSdMR1NsZbB7LZFjs43v/rZY0k6C8uzfZqdytF0eD/3UmZ9J S7IVBvTQesgpvlExblhQ5e8XjbTrLFNf6/r05ghnW6guf5yQFSRWFiHCxcoy9wF3wi 5KCoHSZqODMR2qxffKNYi+Njsz118bPQxpeBxd4w= From: Jacopo Mondi Date: Wed, 10 Dec 2025 09:19:14 +0100 Subject: [PATCH v2 3/6] include: linux: media-bus-format.h: Update to v6.18 MIME-Version: 1.0 Message-Id: <20251210-headers-update-v6-18-v2-3-3f726742a4c8@ideasonboard.com> References: <20251210-headers-update-v6-18-v2-0-3f726742a4c8@ideasonboard.com> In-Reply-To: <20251210-headers-update-v6-18-v2-0-3f726742a4c8@ideasonboard.com> To: libcamera-devel@lists.libcamera.org Cc: Jacopo Mondi , =?utf-8?b?QmFybmFiw6Fz?= =?utf-8?q?_P=C5=91cze?= X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1939; i=jacopo.mondi@ideasonboard.com; h=from:subject:message-id; bh=aEE+jrxRZGA7X0MR1pQTPdh9uYi8cwf+EHdC42VdsHI=; b=owEBbQKS/ZANAwAKAXI0Bo8WoVY8AcsmYgBpOS0NkXJsC5+qQzM9HgIyvAKrybFimVsu4nJ9h d7olQRK1qaJAjMEAAEKAB0WIQS1xD1IgJogio9YOMByNAaPFqFWPAUCaTktDQAKCRByNAaPFqFW PDpCD/sGYalumhW1RBE7XvZpMkQSpwom8szxeKVrt8HuDrSXzk8VXrKjbBL38FMHhbR2aouYNWA l30MwFhjdDT5HGWfoSZEJbc1lg2khO8ViUGABFK+2PDtzVBg1qnOVg8XkmkJooELgGm4u9JIJXY YCfYmrHchifBqsGY/foRl9KOYkI11hN/rPyADZm4RpE6V6TSI76yFxjGKIclIirHW4PPqcQsW4h VffYQiYmwfHZI8SutsoM9gFpFPNcwSwgSWi+9HFfcEYgpDMnKMAkUyYxjR4+5oKVijiYhbRCkbi mEW0Z4J16rZe5fA3jvocXwdecRYYu2XWQQi56X8Xl+7FSYr6eV275qACsnpopoYjYfkHIw5kUJa nnHuODbejOqHTBy/kke90k/rq8swctWAZo3e2F4Wc4313LUwqmvBs4c4WBFfzrTizQAqB8MwiJA F7P4zKA/mFiQidv836B0TcRxdQQ1CSl/P9yNrxCqSB3ACdisRu9IMf6erRbaUsoVU2Ef+EEmvs/ ssuVYUgB8qmyjlJgsuv2jt6fPEx1njiXVcSwWMFa95pv0yi7+EMmuGjRZ+x99W2FJPW3PNsEiVX SSDtG5UlmerS2xcODhUoWimyr1XwgMzrbjQZMkmzq+YeWs6+ttpbwbhhQDWuhUgcQwLGBE1qSal t22FjzqXLACNEwQ== 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 --- 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