7 files changed, 111 insertions, 30 deletions

diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c
index f7061a5ef1d2..516a5b188ea5 100644
--- a/drivers/media/usb/uvc/uvc_ctrl.c
+++ b/drivers/media/usb/uvc/uvc_ctrl.c
@@ -927,7 +927,7 @@ static int __uvc_ctrl_get(struct uvc_video_chain *chain,
         int ret;
 
         if ((ctrl->info.flags & UVC_CTRL_FLAG_GET_CUR) == 0)
-                return -EINVAL;
+                return -EACCES;
 
         if (!ctrl->loaded) {
                 ret = uvc_query_ctrl(chain->dev, UVC_GET_CUR, ctrl->entity->id,
@@ -1061,7 +1061,7 @@ int uvc_query_v4l2_ctrl(struct uvc_video_chain *chain,
 
         ctrl = uvc_find_control(chain, v4l2_ctrl->id, &mapping);
         if (ctrl == NULL) {
-                ret = -EINVAL;
+                ret = -ENOENT;
                 goto done;
         }
 
@@ -1099,12 +1099,13 @@ int uvc_query_v4l2_menu(struct uvc_video_chain *chain,
                 return -ERESTARTSYS;
 
         ctrl = uvc_find_control(chain, query_menu->id, &mapping);
-        if (ctrl == NULL || mapping->v4l2_type != V4L2_CTRL_TYPE_MENU) {
-                ret = -EINVAL;
+        if (ctrl == NULL) {
+                ret = -ENOENT;
                 goto done;
         }
 
-        if (query_menu->index >= mapping->menu_count) {
+        if (mapping->v4l2_type != V4L2_CTRL_TYPE_MENU ||
+            query_menu->index >= mapping->menu_count) {
                 ret = -EINVAL;
                 goto done;
         }
@@ -1263,7 +1264,7 @@ static int uvc_ctrl_add_event(struct v4l2_subscribed_event *sev, unsigned elems)
 
         ctrl = uvc_find_control(handle->chain, sev->id, &mapping);
         if (ctrl == NULL) {
-                ret = -EINVAL;
+                ret = -ENOENT;
                 goto done;
         }
 
@@ -1414,7 +1415,7 @@ int uvc_ctrl_get(struct uvc_video_chain *chain,
 
         ctrl = uvc_find_control(chain, xctrl->id, &mapping);
         if (ctrl == NULL)
-                return -EINVAL;
+                return -ENOENT;
 
         return __uvc_ctrl_get(chain, ctrl, mapping, &xctrl->value);
 }
@@ -1431,8 +1432,10 @@ int uvc_ctrl_set(struct uvc_video_chain *chain,
         int ret;
 
         ctrl = uvc_find_control(chain, xctrl->id, &mapping);
-        if (ctrl == NULL || (ctrl->info.flags & UVC_CTRL_FLAG_SET_CUR) == 0)
-                return -EINVAL;
+        if (ctrl == NULL)
+                return -ENOENT;
+        if (!(ctrl->info.flags & UVC_CTRL_FLAG_SET_CUR))
+                return -EACCES;
 
         /* Clamp out of range values. */
         switch (mapping->v4l2_type) {
@@ -1452,8 +1455,12 @@ int uvc_ctrl_set(struct uvc_video_chain *chain,
                 if (step == 0)
                         step = 1;
 
-                xctrl->value = min + (xctrl->value - min + step/2) / step * step;
-                xctrl->value = clamp(xctrl->value, min, max);
+                xctrl->value = min + ((u32)(xctrl->value - min) + step / 2)
+                             / step * step;
+                if (mapping->data_type == UVC_CTRL_DATA_TYPE_SIGNED)
+                        xctrl->value = clamp(xctrl->value, min, max);
+                else
+                        xctrl->value = clamp_t(u32, xctrl->value, min, max);
                 value = xctrl->value;
                 break;
 
diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c
index 5967081747ce..5dbefa68b1d2 100644
--- a/drivers/media/usb/uvc/uvc_driver.c
+++ b/drivers/media/usb/uvc/uvc_driver.c
@@ -1562,6 +1562,9 @@ static int uvc_scan_device(struct uvc_device *dev)
                 INIT_LIST_HEAD(&chain->entities);
                 mutex_init(&chain->ctrl_mutex);
                 chain->dev = dev;
+                v4l2_prio_init(&chain->prio);
+
+                term->flags |= UVC_ENTITY_FLAG_DEFAULT;
 
                 if (uvc_scan_chain(chain, term) < 0) {
                         kfree(chain);
@@ -1722,6 +1725,8 @@ static int uvc_register_video(struct uvc_device *dev,
         vdev->v4l2_dev = &dev->vdev;
         vdev->fops = &uvc_fops;
         vdev->release = uvc_release;
+        vdev->prio = &stream->chain->prio;
+        set_bit(V4L2_FL_USE_FH_PRIO, &vdev->flags);
         if (stream->type == V4L2_BUF_TYPE_VIDEO_OUTPUT)
                 vdev->vfl_dir = VFL_DIR_TX;
         strlcpy(vdev->name, dev->name, sizeof vdev->name);
@@ -1741,6 +1746,11 @@ static int uvc_register_video(struct uvc_device *dev,
                 return ret;
         }
 
+        if (stream->type == V4L2_BUF_TYPE_VIDEO_CAPTURE)
+                stream->chain->caps |= V4L2_CAP_VIDEO_CAPTURE;
+        else
+                stream->chain->caps |= V4L2_CAP_VIDEO_OUTPUT;
+
         atomic_inc(&dev->nstreams);
         return 0;
 }
diff --git a/drivers/media/usb/uvc/uvc_entity.c b/drivers/media/usb/uvc/uvc_entity.c
index 29e239911d0e..dc56a59ecadc 100644
--- a/drivers/media/usb/uvc/uvc_entity.c
+++ b/drivers/media/usb/uvc/uvc_entity.c
@@ -93,6 +93,8 @@ static int uvc_mc_init_entity(struct uvc_entity *entity)
         } else if (entity->vdev != NULL) {
                 ret = media_entity_init(&entity->vdev->entity,
                                         entity->num_pads, entity->pads, 0);
+                if (entity->flags & UVC_ENTITY_FLAG_DEFAULT)
+                        entity->vdev->entity.flags |= MEDIA_ENT_FL_DEFAULT;
         } else
                 ret = 0;
 
diff --git a/drivers/media/usb/uvc/uvc_queue.c b/drivers/media/usb/uvc/uvc_queue.c
index 18a91fae6bc1..778addc5caff 100644
--- a/drivers/media/usb/uvc/uvc_queue.c
+++ b/drivers/media/usb/uvc/uvc_queue.c
@@ -128,7 +128,7 @@ int uvc_queue_init(struct uvc_video_queue *queue, enum v4l2_buf_type type,
         int ret;
 
         queue->queue.type = type;
-        queue->queue.io_modes = VB2_MMAP | VB2_USERPTR;
+        queue->queue.io_modes = VB2_MMAP | VB2_USERPTR | VB2_DMABUF;
         queue->queue.drv_priv = queue;
         queue->queue.buf_struct_size = sizeof(struct uvc_buffer);
         queue->queue.ops = &uvc_queue_qops;
diff --git a/drivers/media/usb/uvc/uvc_v4l2.c b/drivers/media/usb/uvc/uvc_v4l2.c
index f00db3060e0e..8e056046bc20 100644
--- a/drivers/media/usb/uvc/uvc_v4l2.c
+++ b/drivers/media/usb/uvc/uvc_v4l2.c
@@ -165,17 +165,18 @@ static int uvc_v4l2_try_format(struct uvc_streaming *stream,
                         fcc[0], fcc[1], fcc[2], fcc[3],
                         fmt->fmt.pix.width, fmt->fmt.pix.height);
 
-        /* Check if the hardware supports the requested format. */
+        /* Check if the hardware supports the requested format, use the default
+         * format otherwise.
+         */
         for (i = 0; i < stream->nformats; ++i) {
                 format = &stream->format[i];
                 if (format->fcc == fmt->fmt.pix.pixelformat)
                         break;
         }
 
-        if (format == NULL || format->fcc != fmt->fmt.pix.pixelformat) {
-                uvc_trace(UVC_TRACE_FORMAT, "Unsupported format 0x%08x.\n",
-                                fmt->fmt.pix.pixelformat);
-                return -EINVAL;
+        if (i == stream->nformats) {
+                format = stream->def_format;
+                fmt->fmt.pix.pixelformat = format->fcc;
         }
 
         /* Find the closest image size. The distance between image sizes is
@@ -564,15 +565,30 @@ static long uvc_v4l2_do_ioctl(struct file *file, unsigned int cmd, void *arg)
                 usb_make_path(stream->dev->udev,
                               cap->bus_info, sizeof(cap->bus_info));
                 cap->version = LINUX_VERSION_CODE;
+                cap->capabilities = V4L2_CAP_DEVICE_CAPS | V4L2_CAP_STREAMING
+                                  | chain->caps;
                 if (stream->type == V4L2_BUF_TYPE_VIDEO_CAPTURE)
-                        cap->capabilities = V4L2_CAP_VIDEO_CAPTURE
-                                          | V4L2_CAP_STREAMING;
+                        cap->device_caps = V4L2_CAP_VIDEO_CAPTURE
+                                         | V4L2_CAP_STREAMING;
                 else
-                        cap->capabilities = V4L2_CAP_VIDEO_OUTPUT
-                                          | V4L2_CAP_STREAMING;
+                        cap->device_caps = V4L2_CAP_VIDEO_OUTPUT
+                                         | V4L2_CAP_STREAMING;
                 break;
         }
 
+        /* Priority */
+        case VIDIOC_G_PRIORITY:
+                *(u32 *)arg = v4l2_prio_max(vdev->prio);
+                break;
+
+        case VIDIOC_S_PRIORITY:
+                ret = v4l2_prio_check(vdev->prio, handle->vfh.prio);
+                if (ret < 0)
+                        return ret;
+
+                return v4l2_prio_change(vdev->prio, &handle->vfh.prio,
+                                        *(u32 *)arg);
+
         /* Get, Set & Query control */
         case VIDIOC_QUERYCTRL:
                 return uvc_query_v4l2_ctrl(chain, arg);
@@ -591,8 +607,10 @@ static long uvc_v4l2_do_ioctl(struct file *file, unsigned int cmd, void *arg)
 
                 ret = uvc_ctrl_get(chain, &xctrl);
                 uvc_ctrl_rollback(handle);
-                if (ret >= 0)
-                        ctrl->value = xctrl.value;
+                if (ret < 0)
+                        return ret == -ENOENT ? -EINVAL : ret;
+
+                ctrl->value = xctrl.value;
                 break;
         }
 
@@ -601,6 +619,10 @@ static long uvc_v4l2_do_ioctl(struct file *file, unsigned int cmd, void *arg)
                 struct v4l2_control *ctrl = arg;
                 struct v4l2_ext_control xctrl;
 
+                ret = v4l2_prio_check(vdev->prio, handle->vfh.prio);
+                if (ret < 0)
+                        return ret;
+
                 memset(&xctrl, 0, sizeof xctrl);
                 xctrl.id = ctrl->id;
                 xctrl.value = ctrl->value;
@@ -612,7 +634,7 @@ static long uvc_v4l2_do_ioctl(struct file *file, unsigned int cmd, void *arg)
                 ret = uvc_ctrl_set(chain, &xctrl);
                 if (ret < 0) {
                         uvc_ctrl_rollback(handle);
-                        return ret;
+                        return ret == -ENOENT ? -EINVAL : ret;
                 }
                 ret = uvc_ctrl_commit(handle, &xctrl, 1);
                 if (ret == 0)
@@ -637,8 +659,9 @@ static long uvc_v4l2_do_ioctl(struct file *file, unsigned int cmd, void *arg)
                         ret = uvc_ctrl_get(chain, ctrl);
                         if (ret < 0) {
                                 uvc_ctrl_rollback(handle);
-                                ctrls->error_idx = i;
-                                return ret;
+                                ctrls->error_idx = ret == -ENOENT
+                                                 ? ctrls->count : i;
+                                return ret == -ENOENT ? -EINVAL : ret;
                         }
                 }
                 ctrls->error_idx = 0;
@@ -647,6 +670,10 @@ static long uvc_v4l2_do_ioctl(struct file *file, unsigned int cmd, void *arg)
         }
 
         case VIDIOC_S_EXT_CTRLS:
+                ret = v4l2_prio_check(vdev->prio, handle->vfh.prio);
+                if (ret < 0)
+                        return ret;
+                /* Fall through */
         case VIDIOC_TRY_EXT_CTRLS:
         {
                 struct v4l2_ext_controls *ctrls = arg;
@@ -661,8 +688,10 @@ static long uvc_v4l2_do_ioctl(struct file *file, unsigned int cmd, void *arg)
                         ret = uvc_ctrl_set(chain, ctrl);
                         if (ret < 0) {
                                 uvc_ctrl_rollback(handle);
-                                ctrls->error_idx = i;
-                                return ret;
+                                ctrls->error_idx = (ret == -ENOENT &&
+                                                    cmd == VIDIOC_S_EXT_CTRLS)
+                                                 ? ctrls->count : i;
+                                return ret == -ENOENT ? -EINVAL : ret;
                         }
                 }
 
@@ -739,6 +768,10 @@ static long uvc_v4l2_do_ioctl(struct file *file, unsigned int cmd, void *arg)
         {
                 u32 input = *(u32 *)arg + 1;
 
+                ret = v4l2_prio_check(vdev->prio, handle->vfh.prio);
+                if (ret < 0)
+                        return ret;
+
                 if ((ret = uvc_acquire_privileges(handle)) < 0)
                         return ret;
 
@@ -792,6 +825,10 @@ static long uvc_v4l2_do_ioctl(struct file *file, unsigned int cmd, void *arg)
         }
 
         case VIDIOC_S_FMT:
+                ret = v4l2_prio_check(vdev->prio, handle->vfh.prio);
+                if (ret < 0)
+                        return ret;
+
                 if ((ret = uvc_acquire_privileges(handle)) < 0)
                         return ret;
 
@@ -894,6 +931,10 @@ static long uvc_v4l2_do_ioctl(struct file *file, unsigned int cmd, void *arg)
                 return uvc_v4l2_get_streamparm(stream, arg);
 
         case VIDIOC_S_PARM:
+                ret = v4l2_prio_check(vdev->prio, handle->vfh.prio);
+                if (ret < 0)
+                        return ret;
+
                 if ((ret = uvc_acquire_privileges(handle)) < 0)
                         return ret;
 
@@ -924,10 +965,14 @@ static long uvc_v4l2_do_ioctl(struct file *file, unsigned int cmd, void *arg)
 
         case VIDIOC_G_CROP:
         case VIDIOC_S_CROP:
-                return -EINVAL;
+                return -ENOTTY;
 
         /* Buffers & streaming */
         case VIDIOC_REQBUFS:
+                ret = v4l2_prio_check(vdev->prio, handle->vfh.prio);
+                if (ret < 0)
+                        return ret;
+
                 if ((ret = uvc_acquire_privileges(handle)) < 0)
                         return ret;
 
@@ -973,6 +1018,10 @@ static long uvc_v4l2_do_ioctl(struct file *file, unsigned int cmd, void *arg)
                 if (*type != stream->type)
                         return -EINVAL;
 
+                ret = v4l2_prio_check(vdev->prio, handle->vfh.prio);
+                if (ret < 0)
+                        return ret;
+
                 if (!uvc_has_privileges(handle))
                         return -EBUSY;
 
@@ -991,6 +1040,10 @@ static long uvc_v4l2_do_ioctl(struct file *file, unsigned int cmd, void *arg)
                 if (*type != stream->type)
                         return -EINVAL;
 
+                ret = v4l2_prio_check(vdev->prio, handle->vfh.prio);
+                if (ret < 0)
+                        return ret;
+
                 if (!uvc_has_privileges(handle))
                         return -EBUSY;
 
@@ -1030,7 +1083,7 @@ static long uvc_v4l2_do_ioctl(struct file *file, unsigned int cmd, void *arg)
 
         case VIDIOC_ENUMOUTPUT:
                 uvc_trace(UVC_TRACE_IOCTL, "Unsupported ioctl 0x%08x\n", cmd);
-                return -EINVAL;
+                return -ENOTTY;
 
         case UVCIOC_CTRL_MAP:
                 return uvc_ioctl_ctrl_map(chain, arg);
diff --git a/drivers/media/usb/uvc/uvc_video.c b/drivers/media/usb/uvc/uvc_video.c
index 57c3076a4625..3394c3432011 100644
--- a/drivers/media/usb/uvc/uvc_video.c
+++ b/drivers/media/usb/uvc/uvc_video.c
@@ -1812,6 +1812,7 @@ int uvc_video_init(struct uvc_streaming *stream)
         probe->bFormatIndex = format->index;
         probe->bFrameIndex = frame->bFrameIndex;
 
+        stream->def_format = format;
         stream->cur_format = format;
         stream->cur_frame = frame;
 
diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h
index af216ec45e39..af505fdd9b3f 100644
--- a/drivers/media/usb/uvc/uvcvideo.h
+++ b/drivers/media/usb/uvc/uvcvideo.h
@@ -225,10 +225,14 @@ struct uvc_format_desc {
  * always be accessed with the UVC_ENTITY_* macros and never directly.
  */
 
+#define UVC_ENTITY_FLAG_DEFAULT         (1 << 0)
+
 struct uvc_entity {
         struct list_head list;          /* Entity as part of a UVC device. */
         struct list_head chain;         /* Entity as part of a video device
                                          * chain. */
+        unsigned int flags;
+
         __u8 id;
         __u16 type;
         char name[64];
@@ -371,6 +375,9 @@ struct uvc_video_chain {
         struct uvc_entity *selector;            /* Selector unit */
 
         struct mutex ctrl_mutex;                /* Protects ctrl.info */
+
+        struct v4l2_prio_state prio;            /* V4L2 priority state */
+        u32 caps;                               /* V4L2 chain-wide caps */
 };
 
 struct uvc_stats_frame {
@@ -436,6 +443,7 @@ struct uvc_streaming {
         struct uvc_format *format;
 
         struct uvc_streaming_control ctrl;
+        struct uvc_format *def_format;
         struct uvc_format *cur_format;
         struct uvc_frame *cur_frame;
         /* Protect access to ctrl, cur_format, cur_frame and hardware video