Index | Thread | Search

From:
Kirill A. Korinsky <kirill@korins.ky>
Subject:
sys/videoio.h: sync with Linux
To:
OpenBSD tech <tech@openbsd.org>
Date:
Thu, 04 Dec 2025 22:15:09 +0100

Download raw body.

Thread
  • Kirill A. Korinsky:

    sys/videoio.h: sync with Linux

tech@,

I'd like to sync our sys/videoio.h with Linux upstream.

Related commits:

1. media: Add MALI_C55_3A_STATS meta format
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=4d36f732366aeb32bf3486545e597500a3bf0994

2. media: mali-c55: Add image formats for Mali-C55 parameters buffer
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=1ab3cb233d61131b2d02650f8ed9e4e077fd4508

3. media: uapi: Add controls for Mali-C55 ISP
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=8d0bbed21ef737195277c0af8c30511fb72e608b

Diff:

Index: sys/sys/videoio.h
===================================================================
RCS file: /home/cvs/src/sys/sys/videoio.h,v
diff -u -p -r1.27 videoio.h
--- sys/sys/videoio.h	30 Oct 2025 16:37:40 -0000	1.27
+++ sys/sys/videoio.h	4 Dec 2025 21:13:00 -0000
@@ -343,6 +343,12 @@ enum v4l2_colorfx {
  */
 #define V4L2_CID_USER_RKISP1_BASE		(V4L2_CID_USER_BASE + 0x1220)
 
+/*
+ * The base for the Arm Mali-C55 ISP driver controls.
+ * We reserve 16 controls for this driver
+ */
+#define V4L2_CID_USER_MALI_C55_BASE		(V4L2_CID_USER_BASE + 0x1230)
+
 /* MPEG-class control IDs */
 /* The MPEG controls are applicable to all codec controls
  * and the 'MPEG' part of the define is historical */
@@ -4423,6 +4429,10 @@ struct v4l2_pix_format {
 #define V4L2_META_FMT_RPI_BE_CFG	v4l2_fourcc('R', 'P', 'B', 'C') /* PiSP BE configuration */
 #define V4L2_META_FMT_RPI_FE_CFG	v4l2_fourcc('R', 'P', 'F', 'C') /* PiSP FE configuration */
 #define V4L2_META_FMT_RPI_FE_STATS	v4l2_fourcc('R', 'P', 'F', 'S') /* PiSP FE stats */
+
+/* Vendor specific - used for Arm Mali-C55 ISP */
+#define V4L2_META_FMT_MALI_C55_PARAMS	v4l2_fourcc('C', '5', '5', 'P') /* ARM Mali-C55 Parameters */
+#define V4L2_META_FMT_MALI_C55_STATS	v4l2_fourcc('C', '5', '5', 'S') /* ARM Mali-C55 3A Statistics */
 
 /* priv field value to indicates that subsequent fields are valid. */
 #define V4L2_PIX_FMT_PRIV_MAGIC		0xfeedcafe