target/linux/bcm27xx/patches-5.4/950-0991-uapi-Update-V4L2_CID_USER_BCM2835_ISP_BASE-due-to-up.patch

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