{"id":25352,"url":"https://patchwork.libcamera.org/api/patches/25352/?format=json","web_url":"https://patchwork.libcamera.org/patch/25352/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20251204-headers-update-v6-18-v1-4-93135d14a081@ideasonboard.com>","date":"2025-12-04T15:54:17","name":"[4/6] include: linux: v4l2-controls.h: Update to v6.18","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"d4313dcfeac6531deaa36dd10c187fdff5a0cb97","submitter":{"id":143,"url":"https://patchwork.libcamera.org/api/people/143/?format=json","name":"Jacopo Mondi","email":"jacopo.mondi@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/25352/mbox/","series":[{"id":5635,"url":"https://patchwork.libcamera.org/api/series/5635/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=5635","date":"2025-12-04T15:54:13","name":"include: linux: Update headers to Linux v6.18","version":1,"mbox":"https://patchwork.libcamera.org/series/5635/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/25352/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/25352/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 8E076C32AF\n\tfor ;\n\tThu, 4 Dec 2025 15:54:46 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 0CF1C6112B;\n\tThu, 4 Dec 2025 16:54:46 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 0A4D1609E0\n\tfor ;\n\tThu, 4 Dec 2025 16:54:40 +0100 (CET)","from [192.168.1.182] (93-46-82-201.ip106.fastwebnet.it\n\t[93.46.82.201])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 2846B161D;\n\tThu, 4 Dec 2025 16:52:23 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"vunx4Z1c\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1764863543;\n\tbh=ozJJ5plHEgNnwn+VEJ6IH2SUqDCZsxkvat5VsB0U6co=;\n\th=From:Date:Subject:References:In-Reply-To:To:Cc:From;\n\tb=vunx4Z1csJ0xlm3z5Mnrst3Y5GEryVINeqFY66mt+PfJBXa9tsIMHQUR2CHLMB9SZ\n\t++PgaoGXRWCBXsbxMU3LmUEIRCUf7Q9z17fBwM8ytFh/YIqZPk3U+sPC1QF7hvGH8u\n\t5vvmczGh9gWZV3n9RQVjDJfGRKkJhBgZ0O9x7TxQ=","From":"Jacopo Mondi ","Date":"Thu, 04 Dec 2025 16:54:17 +0100","Subject":"[PATCH 4/6] include: linux: v4l2-controls.h: Update to v6.18","MIME-Version":"1.0","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"7bit","Message-Id":"<20251204-headers-update-v6-18-v1-4-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=8528;\n\ti=jacopo.mondi@ideasonboard.com; h=from:subject:message-id;\n\tbh=ozJJ5plHEgNnwn+VEJ6IH2SUqDCZsxkvat5VsB0U6co=;\n\tb=owEBbQKS/ZANAwAKAXI0Bo8WoVY8AcsmYgBpMa68p8Bmt7kxDLT6mkFEBN9rcHSuQCqkiL/EK\n\tZ1ZvdlUOQOJAjMEAAEKAB0WIQS1xD1IgJogio9YOMByNAaPFqFWPAUCaTGuvAAKCRByNAaPFqFW\n\tPLyLEACMszuLZhDsGqzCN8XQcPSHH2XyEYlkI0fEwG7Qv6/0xhLbqMOb8h4kMmCNVLkd7JrlnW0\n\tHPtEhHoQTwV18ehpXwxTyojwq1K++fBgkGTDZIsvyQjH8xHHYHgNH5ZaWyk1+pO4HPm1n6wkftY\n\taWrYkZeViQiwQXxcSYfiVOtjNJOPGRabqYjm5KxxiJgfZseuuj05wDAmzK/eOua5xhwHUrM+dT9\n\t8wMU6k8i1pURUAZL1x5R/obsP7u6dhGPXmUiTi4tRiKANDNzaZiPuJl2JP/QlZC+taLLnprqvbR\n\tjbOqC5E9bCT7RA9dy7vf4VzWKayVyrx7VvIjre0TvsciwAsESzaL36wPuE9t0KjicpWIjKVTKt0\n\t44FkAtPVkOX4DKxhzKaE9jxlL3BRDj0D0z9gwCSIrJRmBHYdFODj6QyAtgkJnD3QFIcXYNlJwGX\n\tOY3OoIJWgfxtT6VCYj0xrXrBHY2eCXmTIQi6qYScFeovw7u6alg0BG/T+blLV+ClQ8oRYew1nYT\n\tTTQVyEhoBGYm4sntcA9mjGXlLKnRhRyAB9mpylHxbNK771jQBRjPvfFMlCGb2ax2vsbxgcrphuQ\n\tXsETWDv5JdC/MC2Em6wZYhXrQ4vFTnZaEyRjaYVo6Hyxh05MTBKkHRhoUi4H/jtmmrfhreLZhEu\n\td5cJji3Y+z9+h3A==","X-Developer-Key":"i=jacopo.mondi@ideasonboard.com; a=openpgp;\n\tfpr=72392EDC88144A65C701EA9BA5826A2587AD026B","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Update v4l2-controls.h to Linux kernel version v6.18.\n\nNo conflicts between downstream symbols and newly added ones.\n\nSigned-off-by: Jacopo Mondi \n---\n include/linux/v4l2-controls.h | 128 ++++++++++++++++++++++--------------------\n 1 file changed, 67 insertions(+), 61 deletions(-)","diff":"diff --git a/include/linux/v4l2-controls.h b/include/linux/v4l2-controls.h\nindex 4cfae0414894248bfb63aac83a46f71a5dc771c9..25914de2cd7a39a168f59cd80ed331b4b339659f 100644\n--- a/include/linux/v4l2-controls.h\n+++ b/include/linux/v4l2-controls.h\n@@ -217,6 +217,13 @@ enum v4l2_colorfx {\n */\n #define V4L2_CID_USER_THP7312_BASE\t\t(V4L2_CID_USER_BASE + 0x11c0)\n \n+/*\n+ * The base for the uvc driver controls.\n+ * See linux/uvcvideo.h for the list of controls.\n+ * We reserve 64 controls for this driver.\n+ */\n+#define V4L2_CID_USER_UVC_BASE\t\t\t(V4L2_CID_USER_BASE + 0x11e0)\n+\n /*\n * The base for Rockchip ISP1 driver controls.\n * We reserve 16 controls for this driver.\n@@ -1186,7 +1193,7 @@ enum v4l2_flash_strobe_source {\n #define V4L2_CID_JPEG_CLASS_BASE\t\t(V4L2_CTRL_CLASS_JPEG | 0x900)\n #define V4L2_CID_JPEG_CLASS\t\t\t(V4L2_CTRL_CLASS_JPEG | 1)\n \n-#define\tV4L2_CID_JPEG_CHROMA_SUBSAMPLING\t(V4L2_CID_JPEG_CLASS_BASE + 1)\n+#define V4L2_CID_JPEG_CHROMA_SUBSAMPLING\t(V4L2_CID_JPEG_CLASS_BASE + 1)\n enum v4l2_jpeg_chroma_subsampling {\n \tV4L2_JPEG_CHROMA_SUBSAMPLING_444\t= 0,\n \tV4L2_JPEG_CHROMA_SUBSAMPLING_422\t= 1,\n@@ -1195,15 +1202,15 @@ enum v4l2_jpeg_chroma_subsampling {\n \tV4L2_JPEG_CHROMA_SUBSAMPLING_410\t= 4,\n \tV4L2_JPEG_CHROMA_SUBSAMPLING_GRAY\t= 5,\n };\n-#define\tV4L2_CID_JPEG_RESTART_INTERVAL\t\t(V4L2_CID_JPEG_CLASS_BASE + 2)\n-#define\tV4L2_CID_JPEG_COMPRESSION_QUALITY\t(V4L2_CID_JPEG_CLASS_BASE + 3)\n+#define V4L2_CID_JPEG_RESTART_INTERVAL\t\t(V4L2_CID_JPEG_CLASS_BASE + 2)\n+#define V4L2_CID_JPEG_COMPRESSION_QUALITY\t(V4L2_CID_JPEG_CLASS_BASE + 3)\n \n-#define\tV4L2_CID_JPEG_ACTIVE_MARKER\t\t(V4L2_CID_JPEG_CLASS_BASE + 4)\n-#define\tV4L2_JPEG_ACTIVE_MARKER_APP0\t\t(1 << 0)\n-#define\tV4L2_JPEG_ACTIVE_MARKER_APP1\t\t(1 << 1)\n-#define\tV4L2_JPEG_ACTIVE_MARKER_COM\t\t(1 << 16)\n-#define\tV4L2_JPEG_ACTIVE_MARKER_DQT\t\t(1 << 17)\n-#define\tV4L2_JPEG_ACTIVE_MARKER_DHT\t\t(1 << 18)\n+#define V4L2_CID_JPEG_ACTIVE_MARKER\t\t(V4L2_CID_JPEG_CLASS_BASE + 4)\n+#define V4L2_JPEG_ACTIVE_MARKER_APP0\t\t(1 << 0)\n+#define V4L2_JPEG_ACTIVE_MARKER_APP1\t\t(1 << 1)\n+#define V4L2_JPEG_ACTIVE_MARKER_COM\t\t(1 << 16)\n+#define V4L2_JPEG_ACTIVE_MARKER_DQT\t\t(1 << 17)\n+#define V4L2_JPEG_ACTIVE_MARKER_DHT\t\t(1 << 18)\n \n \n /* Image source controls */\n@@ -1236,10 +1243,10 @@ enum v4l2_jpeg_chroma_subsampling {\n #define V4L2_CID_DV_CLASS_BASE\t\t\t(V4L2_CTRL_CLASS_DV | 0x900)\n #define V4L2_CID_DV_CLASS\t\t\t(V4L2_CTRL_CLASS_DV | 1)\n \n-#define\tV4L2_CID_DV_TX_HOTPLUG\t\t\t(V4L2_CID_DV_CLASS_BASE + 1)\n-#define\tV4L2_CID_DV_TX_RXSENSE\t\t\t(V4L2_CID_DV_CLASS_BASE + 2)\n-#define\tV4L2_CID_DV_TX_EDID_PRESENT\t\t(V4L2_CID_DV_CLASS_BASE + 3)\n-#define\tV4L2_CID_DV_TX_MODE\t\t\t(V4L2_CID_DV_CLASS_BASE + 4)\n+#define V4L2_CID_DV_TX_HOTPLUG\t\t\t(V4L2_CID_DV_CLASS_BASE + 1)\n+#define V4L2_CID_DV_TX_RXSENSE\t\t\t(V4L2_CID_DV_CLASS_BASE + 2)\n+#define V4L2_CID_DV_TX_EDID_PRESENT\t\t(V4L2_CID_DV_CLASS_BASE + 3)\n+#define V4L2_CID_DV_TX_MODE\t\t\t(V4L2_CID_DV_CLASS_BASE + 4)\n enum v4l2_dv_tx_mode {\n \tV4L2_DV_TX_MODE_DVI_D\t= 0,\n \tV4L2_DV_TX_MODE_HDMI\t= 1,\n@@ -1260,7 +1267,7 @@ enum v4l2_dv_it_content_type {\n \tV4L2_DV_IT_CONTENT_TYPE_NO_ITC\t = 4,\n };\n \n-#define\tV4L2_CID_DV_RX_POWER_PRESENT\t\t(V4L2_CID_DV_CLASS_BASE + 100)\n+#define V4L2_CID_DV_RX_POWER_PRESENT\t\t(V4L2_CID_DV_CLASS_BASE + 100)\n #define V4L2_CID_DV_RX_RGB_RANGE\t\t(V4L2_CID_DV_CLASS_BASE + 101)\n #define V4L2_CID_DV_RX_IT_CONTENT_TYPE\t\t(V4L2_CID_DV_CLASS_BASE + 102)\n \n@@ -1530,15 +1537,6 @@ struct v4l2_ctrl_h264_pred_weights {\n \tstruct v4l2_h264_weight_factors weight_factors[2];\n };\n \n-#define V4L2_H264_SLICE_TYPE_P\t\t\t\t0\n-#define V4L2_H264_SLICE_TYPE_B\t\t\t\t1\n-#define V4L2_H264_SLICE_TYPE_I\t\t\t\t2\n-#define V4L2_H264_SLICE_TYPE_SP\t\t\t\t3\n-#define V4L2_H264_SLICE_TYPE_SI\t\t\t\t4\n-\n-#define V4L2_H264_SLICE_FLAG_DIRECT_SPATIAL_MV_PRED\t0x01\n-#define V4L2_H264_SLICE_FLAG_SP_FOR_SWITCH\t\t0x02\n-\n #define V4L2_H264_TOP_FIELD_REF\t\t\t\t0x1\n #define V4L2_H264_BOTTOM_FIELD_REF\t\t\t0x2\n #define V4L2_H264_FRAME_REF\t\t\t\t0x3\n@@ -1559,8 +1557,17 @@ struct v4l2_h264_reference {\n * Maximum DPB size, as specified by section 'A.3.1 Level limits\n * common to the Baseline, Main, and Extended profiles'.\n */\n-#define V4L2_H264_NUM_DPB_ENTRIES 16\n-#define V4L2_H264_REF_LIST_LEN (2 * V4L2_H264_NUM_DPB_ENTRIES)\n+#define V4L2_H264_NUM_DPB_ENTRIES\t\t16\n+#define V4L2_H264_REF_LIST_LEN\t\t\t(2 * V4L2_H264_NUM_DPB_ENTRIES)\n+\n+#define V4L2_H264_SLICE_TYPE_P\t\t\t\t0\n+#define V4L2_H264_SLICE_TYPE_B\t\t\t\t1\n+#define V4L2_H264_SLICE_TYPE_I\t\t\t\t2\n+#define V4L2_H264_SLICE_TYPE_SP\t\t\t\t3\n+#define V4L2_H264_SLICE_TYPE_SI\t\t\t\t4\n+\n+#define V4L2_H264_SLICE_FLAG_DIRECT_SPATIAL_MV_PRED\t\t0x01\n+#define V4L2_H264_SLICE_FLAG_SP_FOR_SWITCH\t\t\t0x02\n \n #define V4L2_CID_STATELESS_H264_SLICE_PARAMS\t(V4L2_CID_CODEC_STATELESS_BASE + 6)\n /**\n@@ -1700,7 +1707,6 @@ struct v4l2_ctrl_h264_decode_params {\n \t__u32 flags;\n };\n \n-\n /* Stateless FWHT control, used by the vicodec driver */\n \n /* Current FWHT version */\n@@ -2542,44 +2548,10 @@ struct v4l2_ctrl_hevc_scaling_matrix {\n \t__u8\tscaling_list_dc_coef_32x32[2];\n };\n \n-#define V4L2_CID_COLORIMETRY_CLASS_BASE\t(V4L2_CTRL_CLASS_COLORIMETRY | 0x900)\n-#define V4L2_CID_COLORIMETRY_CLASS\t(V4L2_CTRL_CLASS_COLORIMETRY | 1)\n-\n-#define V4L2_CID_COLORIMETRY_HDR10_CLL_INFO\t(V4L2_CID_COLORIMETRY_CLASS_BASE + 0)\n-\n-struct v4l2_ctrl_hdr10_cll_info {\n-\t__u16 max_content_light_level;\n-\t__u16 max_pic_average_light_level;\n-};\n-\n-#define V4L2_CID_COLORIMETRY_HDR10_MASTERING_DISPLAY\t(V4L2_CID_COLORIMETRY_CLASS_BASE + 1)\n-\n-#define V4L2_HDR10_MASTERING_PRIMARIES_X_LOW\t5\n-#define V4L2_HDR10_MASTERING_PRIMARIES_X_HIGH\t37000\n-#define V4L2_HDR10_MASTERING_PRIMARIES_Y_LOW\t5\n-#define V4L2_HDR10_MASTERING_PRIMARIES_Y_HIGH\t42000\n-#define V4L2_HDR10_MASTERING_WHITE_POINT_X_LOW\t5\n-#define V4L2_HDR10_MASTERING_WHITE_POINT_X_HIGH\t37000\n-#define V4L2_HDR10_MASTERING_WHITE_POINT_Y_LOW\t5\n-#define V4L2_HDR10_MASTERING_WHITE_POINT_Y_HIGH\t42000\n-#define V4L2_HDR10_MASTERING_MAX_LUMA_LOW\t50000\n-#define V4L2_HDR10_MASTERING_MAX_LUMA_HIGH\t100000000\n-#define V4L2_HDR10_MASTERING_MIN_LUMA_LOW\t1\n-#define V4L2_HDR10_MASTERING_MIN_LUMA_HIGH\t50000\n-\n-struct v4l2_ctrl_hdr10_mastering_display {\n-\t__u16 display_primaries_x[3];\n-\t__u16 display_primaries_y[3];\n-\t__u16 white_point_x;\n-\t__u16 white_point_y;\n-\t__u32 max_display_mastering_luminance;\n-\t__u32 min_display_mastering_luminance;\n-};\n-\n /* Stateless VP9 controls */\n \n #define V4L2_VP9_LOOP_FILTER_FLAG_DELTA_ENABLED\t0x1\n-#define\tV4L2_VP9_LOOP_FILTER_FLAG_DELTA_UPDATE\t0x2\n+#define V4L2_VP9_LOOP_FILTER_FLAG_DELTA_UPDATE\t0x2\n \n /**\n * struct v4l2_vp9_loop_filter - VP9 loop filter parameters\n@@ -3506,4 +3478,38 @@ struct v4l2_ctrl_av1_film_grain {\n #define V4L2_CID_MPEG_CX2341X_BASE V4L2_CID_CODEC_CX2341X_BASE\n #define V4L2_CID_MPEG_MFC51_BASE V4L2_CID_CODEC_MFC51_BASE\n \n+#define V4L2_CID_COLORIMETRY_CLASS_BASE\t(V4L2_CTRL_CLASS_COLORIMETRY | 0x900)\n+#define V4L2_CID_COLORIMETRY_CLASS\t(V4L2_CTRL_CLASS_COLORIMETRY | 1)\n+\n+#define V4L2_CID_COLORIMETRY_HDR10_CLL_INFO\t(V4L2_CID_COLORIMETRY_CLASS_BASE + 0)\n+\n+struct v4l2_ctrl_hdr10_cll_info {\n+\t__u16 max_content_light_level;\n+\t__u16 max_pic_average_light_level;\n+};\n+\n+#define V4L2_CID_COLORIMETRY_HDR10_MASTERING_DISPLAY\t(V4L2_CID_COLORIMETRY_CLASS_BASE + 1)\n+\n+#define V4L2_HDR10_MASTERING_PRIMARIES_X_LOW\t5\n+#define V4L2_HDR10_MASTERING_PRIMARIES_X_HIGH\t37000\n+#define V4L2_HDR10_MASTERING_PRIMARIES_Y_LOW\t5\n+#define V4L2_HDR10_MASTERING_PRIMARIES_Y_HIGH\t42000\n+#define V4L2_HDR10_MASTERING_WHITE_POINT_X_LOW\t5\n+#define V4L2_HDR10_MASTERING_WHITE_POINT_X_HIGH\t37000\n+#define V4L2_HDR10_MASTERING_WHITE_POINT_Y_LOW\t5\n+#define V4L2_HDR10_MASTERING_WHITE_POINT_Y_HIGH\t42000\n+#define V4L2_HDR10_MASTERING_MAX_LUMA_LOW\t50000\n+#define V4L2_HDR10_MASTERING_MAX_LUMA_HIGH\t100000000\n+#define V4L2_HDR10_MASTERING_MIN_LUMA_LOW\t1\n+#define V4L2_HDR10_MASTERING_MIN_LUMA_HIGH\t50000\n+\n+struct v4l2_ctrl_hdr10_mastering_display {\n+\t__u16 display_primaries_x[3];\n+\t__u16 display_primaries_y[3];\n+\t__u16 white_point_x;\n+\t__u16 white_point_y;\n+\t__u32 max_display_mastering_luminance;\n+\t__u32 min_display_mastering_luminance;\n+};\n+\n #endif\n","prefixes":["4/6"]}