| Message ID | 1348758980-21683-7-git-send-email-laurent.pinchart@ideasonboard.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu September 27 2012 17:16:20 Laurent Pinchart wrote: > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- > drivers/media/usb/uvc/uvc_driver.c | 3 ++ > drivers/media/usb/uvc/uvc_v4l2.c | 45 ++++++++++++++++++++++++++++++++++++ > drivers/media/usb/uvc/uvcvideo.h | 1 + > 3 files changed, 49 insertions(+), 0 deletions(-) > > diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c > index ae24f7d..22f14d2 100644 > --- a/drivers/media/usb/uvc/uvc_driver.c > +++ b/drivers/media/usb/uvc/uvc_driver.c > @@ -1562,6 +1562,7 @@ 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); > > if (uvc_scan_chain(chain, term) < 0) { > kfree(chain); > @@ -1722,6 +1723,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); This set_bit() doesn't do anything as long as you are not using video_ioctl2(). And why aren't you using video_ioctl2()? This is the last driver to do it all manually. If you'd switch to video_ioctl2(), then setting this bit would be all you had to do. > if (stream->type == V4L2_BUF_TYPE_VIDEO_OUTPUT) > vdev->vfl_dir = VFL_DIR_TX; > strlcpy(vdev->name, dev->name, sizeof vdev->name); > diff --git a/drivers/media/usb/uvc/uvc_v4l2.c b/drivers/media/usb/uvc/uvc_v4l2.c > index bf9d073..d6aa402 100644 > --- a/drivers/media/usb/uvc/uvc_v4l2.c > +++ b/drivers/media/usb/uvc/uvc_v4l2.c > @@ -576,6 +576,19 @@ static long uvc_v4l2_do_ioctl(struct file *file, unsigned int cmd, void *arg) > 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); > @@ -606,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; > @@ -653,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; > + > case VIDIOC_TRY_EXT_CTRLS: > { > struct v4l2_ext_controls *ctrls = arg; > @@ -747,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; > > @@ -800,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; > > @@ -902,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; > > @@ -936,6 +969,10 @@ static long uvc_v4l2_do_ioctl(struct file *file, unsigned int cmd, void *arg) > > /* 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; > > @@ -981,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; > > @@ -999,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; This patch is hard to read since I can't see for which ioctls you check the prio. Can you regenerate the patch with more context lines? The patch as it is will probably not apply reliably due to the same reason. In particular, make sure you also check for the UVC-specific ioctls (UVCIOC_CTRL_MAP might need this, but I'm not sure about that). Regards, Hans > > diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h > index 28ff015..acf6bf2 100644 > --- a/drivers/media/usb/uvc/uvcvideo.h > +++ b/drivers/media/usb/uvc/uvcvideo.h > @@ -372,6 +372,7 @@ struct uvc_video_chain { > > struct mutex ctrl_mutex; /* Protects ctrl.info */ > > + struct v4l2_prio_state prio; /* V4L2 priority state */ > u32 caps; /* V4L2 chain-wide caps */ > }; > > -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Hans, Thank you for the review. On Friday 16 November 2012 15:07:42 Hans Verkuil wrote: > On Thu September 27 2012 17:16:20 Laurent Pinchart wrote: > > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > > --- > > > > drivers/media/usb/uvc/uvc_driver.c | 3 ++ > > drivers/media/usb/uvc/uvc_v4l2.c | 45 +++++++++++++++++++++++++++++++ > > drivers/media/usb/uvc/uvcvideo.h | 1 + > > 3 files changed, 49 insertions(+), 0 deletions(-) > > > > diff --git a/drivers/media/usb/uvc/uvc_driver.c > > b/drivers/media/usb/uvc/uvc_driver.c index ae24f7d..22f14d2 100644 > > --- a/drivers/media/usb/uvc/uvc_driver.c > > +++ b/drivers/media/usb/uvc/uvc_driver.c [snip] > > @@ -1722,6 +1723,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); > > This set_bit() doesn't do anything as long as you are not using > video_ioctl2(). The bit also makes v4l2_fh_(add|del)() call v4l2_prio_(open|close)(). > And why aren't you using video_ioctl2()? This is the last driver to do it > all manually. If you'd switch to video_ioctl2(), then setting this bit would > be all you had to do. I have a patch for that, I need to resurect it. > > if (stream->type == V4L2_BUF_TYPE_VIDEO_OUTPUT) > > vdev->vfl_dir = VFL_DIR_TX; > > > > strlcpy(vdev->name, dev->name, sizeof vdev->name); > > diff --git a/drivers/media/usb/uvc/uvc_v4l2.c > > b/drivers/media/usb/uvc/uvc_v4l2.c index bf9d073..d6aa402 100644 > > --- a/drivers/media/usb/uvc/uvc_v4l2.c > > +++ b/drivers/media/usb/uvc/uvc_v4l2.c [snip] > This patch is hard to read since I can't see for which ioctls you check the > prio. Can you regenerate the patch with more context lines? The patch as it > is will probably not apply reliably due to the same reason. My bad. I'll resend it. > In particular, make sure you also check for the UVC-specific ioctls > (UVCIOC_CTRL_MAP might need this, but I'm not sure about that). The UVC-specific ioctls are only control operations, they don't require priority handling.
diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c index ae24f7d..22f14d2 100644 --- a/drivers/media/usb/uvc/uvc_driver.c +++ b/drivers/media/usb/uvc/uvc_driver.c @@ -1562,6 +1562,7 @@ 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); if (uvc_scan_chain(chain, term) < 0) { kfree(chain); @@ -1722,6 +1723,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); diff --git a/drivers/media/usb/uvc/uvc_v4l2.c b/drivers/media/usb/uvc/uvc_v4l2.c index bf9d073..d6aa402 100644 --- a/drivers/media/usb/uvc/uvc_v4l2.c +++ b/drivers/media/usb/uvc/uvc_v4l2.c @@ -576,6 +576,19 @@ static long uvc_v4l2_do_ioctl(struct file *file, unsigned int cmd, void *arg) 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); @@ -606,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; @@ -653,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; + case VIDIOC_TRY_EXT_CTRLS: { struct v4l2_ext_controls *ctrls = arg; @@ -747,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; @@ -800,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; @@ -902,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; @@ -936,6 +969,10 @@ static long uvc_v4l2_do_ioctl(struct file *file, unsigned int cmd, void *arg) /* 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; @@ -981,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; @@ -999,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; diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h index 28ff015..acf6bf2 100644 --- a/drivers/media/usb/uvc/uvcvideo.h +++ b/drivers/media/usb/uvc/uvcvideo.h @@ -372,6 +372,7 @@ struct uvc_video_chain { struct mutex ctrl_mutex; /* Protects ctrl.info */ + struct v4l2_prio_state prio; /* V4L2 priority state */ u32 caps; /* V4L2 chain-wide caps */ };
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> --- drivers/media/usb/uvc/uvc_driver.c | 3 ++ drivers/media/usb/uvc/uvc_v4l2.c | 45 ++++++++++++++++++++++++++++++++++++ drivers/media/usb/uvc/uvcvideo.h | 1 + 3 files changed, 49 insertions(+), 0 deletions(-)