media: uvcvideo: uvc_v4l2_unlocked_ioctl: Invert PM logic

Instead of listing the IOCTLs that do not need to turn on the camera,
list the IOCTLs that need to turn it on. This makes the code more
maintainable.

This patch changes the behaviour for unsupported IOCTLs. Those IOCTLs
will not turn on the camera.

Suggested-by: Hans Verkuil <hans@jjverkuil.nl>
Reviewed-by: Hans de Goede <hansg@kernel.org>
Reviewed-by: Hans Verkuil <hans@hverkuil.nl>
Signed-off-by: Ricardo Ribalda <ribalda@chromium.org>
Link: https://lore.kernel.org/r/20250701-uvc-grannular-invert-v4-7-8003b9b89f68@chromium.org
Signed-off-by: Hans de Goede <hansg@kernel.org>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>

diff --git a/drivers/media/usb/uvc/uvc_v4l2.c b/drivers/media/usb/uvc/uvc_v4l2.c
index 7ab1bdcfb493fe9f47dbdc86da23cba98d7d10ff..160f9cf6e6dbdbf39e3eff56a5d5ea1d977fbe22 100644 (file)
--- a/drivers/media/usb/uvc/uvc_v4l2.c
+++ b/drivers/media/usb/uvc/uvc_v4l2.c
@@ -1222,36 +1222,36 @@ static long uvc_v4l2_unlocked_ioctl(struct file *file,
                                    unsigned int cmd, unsigned long arg)
 {
        struct uvc_fh *handle = file->private_data;
+       unsigned int converted_cmd = v4l2_translate_cmd(cmd);
        int ret;
 
-       /* The following IOCTLs do not need to turn on the camera. */
-       switch (cmd) {
-       case VIDIOC_CREATE_BUFS:
-       case VIDIOC_DQBUF:
-       case VIDIOC_ENUM_FMT:
-       case VIDIOC_ENUM_FRAMEINTERVALS:
-       case VIDIOC_ENUM_FRAMESIZES:
-       case VIDIOC_ENUMINPUT:
-       case VIDIOC_EXPBUF:
-       case VIDIOC_G_FMT:
-       case VIDIOC_G_PARM:
-       case VIDIOC_G_SELECTION:
-       case VIDIOC_QBUF:
-       case VIDIOC_QUERYCAP:
-       case VIDIOC_REQBUFS:
-       case VIDIOC_SUBSCRIBE_EVENT:
-       case VIDIOC_UNSUBSCRIBE_EVENT:
-               return video_ioctl2(file, cmd, arg);
-       }
-
-       ret = uvc_pm_get(handle->stream->dev);
-       if (ret)
+       /* The following IOCTLs need to turn on the camera. */
+       switch (converted_cmd) {
+       case UVCIOC_CTRL_MAP:
+       case UVCIOC_CTRL_QUERY:
+       case VIDIOC_G_CTRL:
+       case VIDIOC_G_EXT_CTRLS:
+       case VIDIOC_G_INPUT:
+       case VIDIOC_QUERYCTRL:
+       case VIDIOC_QUERYMENU:
+       case VIDIOC_QUERY_EXT_CTRL:
+       case VIDIOC_S_CTRL:
+       case VIDIOC_S_EXT_CTRLS:
+       case VIDIOC_S_FMT:
+       case VIDIOC_S_INPUT:
+       case VIDIOC_S_PARM:
+       case VIDIOC_TRY_EXT_CTRLS:
+       case VIDIOC_TRY_FMT:
+               ret = uvc_pm_get(handle->stream->dev);
+               if (ret)
+                       return ret;
+               ret = video_ioctl2(file, cmd, arg);
+               uvc_pm_put(handle->stream->dev);
                return ret;
+       }
 
-       ret = video_ioctl2(file, cmd, arg);
-
-       uvc_pm_put(handle->stream->dev);
-       return ret;
+       /* The other IOCTLs can run with the camera off. */
+       return video_ioctl2(file, cmd, arg);
 }
 
 const struct v4l2_ioctl_ops uvc_ioctl_ops = {