blob: 71c27e168a82d7d06a3eb1e6d0c9896955e9f9f8 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
|
From 90e833fddb15bbdd8aeb6285ba596b4c657383c2 Mon Sep 17 00:00:00 2001
From: Dave Stevenson <dave.stevenson@raspberrypi.com>
Date: Thu, 15 Oct 2020 11:59:02 +0100
Subject: [PATCH] uapi: Update V4L2_CID_USER_BCM2835_ISP_BASE due to
upstream change
Commit "4e52889 media: atmel: atmel-isc-base: expose white
balance as v4l2 controls" in the upstream kernels reserves
(V4L2_CID_USER_BASE + 0x10c0) for use by the Atmel ISC,
therefore we have a control collision with our existing
define for V4L2_CID_USER_BCM2835_ISP_BASE.
Update V4L2_CID_USER_BCM2835_ISP_BASE to + 0x10e0 as the
next available block.
NB ABI breakage for libcamera (the only user of these controls).
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
---
include/uapi/linux/v4l2-controls.h | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
--- a/include/uapi/linux/v4l2-controls.h
+++ b/include/uapi/linux/v4l2-controls.h
@@ -192,9 +192,15 @@ enum v4l2_colorfx {
* We reserve 16 controls for this driver. */
#define V4L2_CID_USER_IMX_BASE (V4L2_CID_USER_BASE + 0x10b0)
+/*
+ * The base for the atmel isc driver controls.
+ * We reserve 32 controls for this driver.
+ */
+#define V4L2_CID_USER_ATMEL_ISC_BASE (V4L2_CID_USER_BASE + 0x10c0)
+
/* The base for the bcm2835-isp driver controls.
* We reserve 16 controls for this driver. */
-#define V4L2_CID_USER_BCM2835_ISP_BASE (V4L2_CID_USER_BASE + 0x10c0)
+#define V4L2_CID_USER_BCM2835_ISP_BASE (V4L2_CID_USER_BASE + 0x10e0)
/* MPEG-class control IDs */
/* The MPEG controls are applicable to all codec controls
|
