[PATCH] media: vim2m: give vim2m a proper control ID range

[PATCH] media: vim2m: give vim2m a proper control ID range

[Hans Verkuil]

The vim2m driver has two driver-specific controls, but the
control IDs were never reserved in v4l2-control.h.

While these control IDs clashes with the range reserved for
the old meye driver, since that meye driver has been removed
from the kernel quite a long time ago we just officially claim
that range for the vim2m driver.

Signed-off-by: Hans Verkuil <hverkuil+cisco@kernel.org>
Reported-by: Nicolas Dufresne <nicolas@ndufresne.ca>
Closes: https://lore.kernel.org/linux-media/71a3fa9710cf1afbb80ebe850878557c3e95a1b2.camel@ndufresne.ca/
---
 drivers/media/test-drivers/vim2m.c | 4 ++--
 include/uapi/linux/v4l2-controls.h | 9 +++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/drivers/media/test-drivers/vim2m.c b/drivers/media/test-drivers/vim2m.c
index bb2dd11eef0e..b16111067f68 100644
--- a/drivers/media/test-drivers/vim2m.c
+++ b/drivers/media/test-drivers/vim2m.c
@@ -150,8 +150,8 @@ enum {
 	V4L2_M2M_DST = 1,
 };

-#define V4L2_CID_TRANS_TIME_MSEC	(V4L2_CID_USER_BASE + 0x1000)
-#define V4L2_CID_TRANS_NUM_BUFS		(V4L2_CID_USER_BASE + 0x1001)
+#define V4L2_CID_TRANS_TIME_MSEC	(V4L2_CID_USER_VIM2M_BASE + 0)
+#define V4L2_CID_TRANS_NUM_BUFS		(V4L2_CID_USER_VIM2M_BASE + 1)

 static struct vim2m_fmt *find_format(u32 fourcc)
 {
diff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linux/v4l2-controls.h
index affec0ab4781..9e3a59638287 100644
--- a/include/uapi/linux/v4l2-controls.h
+++ b/include/uapi/linux/v4l2-controls.h
@@ -123,6 +123,15 @@ enum v4l2_colorfx {
 #define V4L2_CID_USER_MEYE_BASE			(V4L2_CID_USER_BASE + 0x1000)
 #endif

+/*
+ * The base for the vim2m driver controls.
+ * We reserve 16 controls for this driver.
+ * The vim2m control range clashed with the meye control range, which was not
+ * intended, but since the meye driver has been removed, we can just keep the
+ * vim2m control range.
+ */
+#define V4L2_CID_USER_VIM2M_BASE		(V4L2_CID_USER_BASE + 0x1000)
+
 /* The base for the bttv driver controls.
  * We reserve 32 controls for this driver. */
 #define V4L2_CID_USER_BTTV_BASE			(V4L2_CID_USER_BASE + 0x1010)
-- 
2.53.0

Re: [PATCH] media: vim2m: give vim2m a proper control ID range

[Nicolas Dufresne]

[-- Attachment #1: Type: text/plain, Size: 2379 bytes --]

Le mardi 08 septembre 2026 à 12:10 +0200, Hans Verkuil a écrit :
> The vim2m driver has two driver-specific controls, but the
> control IDs were never reserved in v4l2-control.h.
> 
> While these control IDs clashes with the range reserved for
> the old meye driver, since that meye driver has been removed
> from the kernel quite a long time ago we just officially claim
> that range for the vim2m driver.
> 
> Signed-off-by: Hans Verkuil <hverkuil+cisco@kernel.org>
> Reported-by: Nicolas Dufresne <nicolas@ndufresne.ca>

Reviewed-by: Nicolas Dufresne <nicolas.dufresne@collabora.com>

> Closes: https://lore.kernel.org/linux-media/71a3fa9710cf1afbb80ebe850878557c3e95a1b2.camel@ndufresne.ca/
> ---
>  drivers/media/test-drivers/vim2m.c | 4 ++--
>  include/uapi/linux/v4l2-controls.h | 9 +++++++++
>  2 files changed, 11 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/media/test-drivers/vim2m.c b/drivers/media/test-drivers/vim2m.c
> index bb2dd11eef0e..b16111067f68 100644
> --- a/drivers/media/test-drivers/vim2m.c
> +++ b/drivers/media/test-drivers/vim2m.c
> @@ -150,8 +150,8 @@ enum {
>  	V4L2_M2M_DST = 1,
>  };
> 
> -#define V4L2_CID_TRANS_TIME_MSEC	(V4L2_CID_USER_BASE + 0x1000)
> -#define V4L2_CID_TRANS_NUM_BUFS		(V4L2_CID_USER_BASE + 0x1001)
> +#define V4L2_CID_TRANS_TIME_MSEC	(V4L2_CID_USER_VIM2M_BASE + 0)
> +#define V4L2_CID_TRANS_NUM_BUFS		(V4L2_CID_USER_VIM2M_BASE + 1)
> 
>  static struct vim2m_fmt *find_format(u32 fourcc)
>  {
> diff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linux/v4l2-controls.h
> index affec0ab4781..9e3a59638287 100644
> --- a/include/uapi/linux/v4l2-controls.h
> +++ b/include/uapi/linux/v4l2-controls.h
> @@ -123,6 +123,15 @@ enum v4l2_colorfx {
>  #define V4L2_CID_USER_MEYE_BASE			(V4L2_CID_USER_BASE + 0x1000)
>  #endif
> 
> +/*
> + * The base for the vim2m driver controls.
> + * We reserve 16 controls for this driver.
> + * The vim2m control range clashed with the meye control range, which was not
> + * intended, but since the meye driver has been removed, we can just keep the
> + * vim2m control range.
> + */
> +#define V4L2_CID_USER_VIM2M_BASE		(V4L2_CID_USER_BASE + 0x1000)
> +
>  /* The base for the bttv driver controls.
>   * We reserve 32 controls for this driver. */
>  #define V4L2_CID_USER_BTTV_BASE			(V4L2_CID_USER_BASE + 0x1010)

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 228 bytes --]