* [PATCH 0/2] Move UVC gagdet to video_ioctl2
@ 2014-08-18 17:06 Laurent Pinchart
2014-08-18 17:06 ` [PATCH 1/2] usb: gadget: f_uvc: Store EP0 control request state during setup stage Laurent Pinchart
2014-08-18 17:06 ` [PATCH 2/2] usb: gadget: f_uvc: Move to video_ioctl2 Laurent Pinchart
0 siblings, 2 replies; 11+ messages in thread
From: Laurent Pinchart @ 2014-08-18 17:06 UTC (permalink / raw)
To: linux-usb; +Cc: linux-media, Andrzej Pietrasiewicz, Michael Grzeschik
Hello,
This small patch series replaces manual handling of V4L2 ioctls in the UVC
gadget function driver with the video_ioctl2 infrastructure. This simplifies
the driver and brings support for V4L2 tracing features.
The series is based on top of Michael Grzeschik's "usb: gadget/uvc: remove
DRIVER_VERSION{,_NUMBER}" patch. The result can be found at
git://linuxtv.org/pinchartl/media.git uvc/gadget
The patches have been compile-tested only so far. I'd appreciate if someone
could test them on real hardware.
Laurent Pinchart (2):
usb: gadget: f_uvc: Store EP0 control request state during setup stage
usb: gadget: f_uvc: Move to video_ioctl2
drivers/usb/gadget/function/f_uvc.c | 7 +
drivers/usb/gadget/function/uvc_v4l2.c | 315 ++++++++++++++++-----------------
2 files changed, 164 insertions(+), 158 deletions(-)
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 11+ messages in thread* [PATCH 1/2] usb: gadget: f_uvc: Store EP0 control request state during setup stage 2014-08-18 17:06 [PATCH 0/2] Move UVC gagdet to video_ioctl2 Laurent Pinchart @ 2014-08-18 17:06 ` Laurent Pinchart 2014-08-18 17:06 ` [PATCH 2/2] usb: gadget: f_uvc: Move to video_ioctl2 Laurent Pinchart 1 sibling, 0 replies; 11+ messages in thread From: Laurent Pinchart @ 2014-08-18 17:06 UTC (permalink / raw) To: linux-usb; +Cc: linux-media, Andrzej Pietrasiewicz, Michael Grzeschik To handle class requests received on ep0, the driver needs to access the length and direction of the request after the setup stage. It currently stores them in a v4l2 event during the setup stage, and then copies them from the event structure to the driver internal state structure when the event is dequeued. This two-steps approach isn't necessary. Simplify the driver by storing the needed information in the driver internal state structure directly during the setup stage. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> --- drivers/usb/gadget/function/f_uvc.c | 6 ++++++ drivers/usb/gadget/function/uvc_v4l2.c | 19 +------------------ 2 files changed, 7 insertions(+), 18 deletions(-) diff --git a/drivers/usb/gadget/function/f_uvc.c b/drivers/usb/gadget/function/f_uvc.c index ff4340a..e9d625b 100644 --- a/drivers/usb/gadget/function/f_uvc.c +++ b/drivers/usb/gadget/function/f_uvc.c @@ -251,6 +251,12 @@ uvc_function_setup(struct usb_function *f, const struct usb_ctrlrequest *ctrl) if (le16_to_cpu(ctrl->wLength) > UVC_MAX_REQUEST_SIZE) return -EINVAL; + /* Tell the complete callback to generate an event for the next request + * that will be enqueued by UVCIOC_SEND_RESPONSE. + */ + uvc->event_setup_out = !(ctrl->bRequestType & USB_DIR_IN); + uvc->event_length = le16_to_cpu(ctrl->wLength); + memset(&v4l2_event, 0, sizeof(v4l2_event)); v4l2_event.type = UVC_EVENT_SETUP; memcpy(&uvc_event->req, ctrl, sizeof(uvc_event->req)); diff --git a/drivers/usb/gadget/function/uvc_v4l2.c b/drivers/usb/gadget/function/uvc_v4l2.c index bcd71ce..f22b878 100644 --- a/drivers/usb/gadget/function/uvc_v4l2.c +++ b/drivers/usb/gadget/function/uvc_v4l2.c @@ -271,25 +271,8 @@ uvc_v4l2_do_ioctl(struct file *file, unsigned int cmd, void *arg) /* Events */ case VIDIOC_DQEVENT: - { - struct v4l2_event *event = arg; - - ret = v4l2_event_dequeue(&handle->vfh, event, + return v4l2_event_dequeue(&handle->vfh, arg, file->f_flags & O_NONBLOCK); - if (ret == 0 && event->type == UVC_EVENT_SETUP) { - struct uvc_event *uvc_event = (void *)&event->u.data; - - /* Tell the complete callback to generate an event for - * the next request that will be enqueued by - * uvc_event_write. - */ - uvc->event_setup_out = - !(uvc_event->req.bRequestType & USB_DIR_IN); - uvc->event_length = uvc_event->req.wLength; - } - - return ret; - } case VIDIOC_SUBSCRIBE_EVENT: { -- 1.8.5.5 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 2/2] usb: gadget: f_uvc: Move to video_ioctl2 2014-08-18 17:06 [PATCH 0/2] Move UVC gagdet to video_ioctl2 Laurent Pinchart 2014-08-18 17:06 ` [PATCH 1/2] usb: gadget: f_uvc: Store EP0 control request state during setup stage Laurent Pinchart @ 2014-08-18 17:06 ` Laurent Pinchart 2014-08-18 18:24 ` Hans Verkuil 2014-08-27 15:16 ` [PATCH] usb: gadget: f_uvc fix transition " Andrzej Pietrasiewicz 1 sibling, 2 replies; 11+ messages in thread From: Laurent Pinchart @ 2014-08-18 17:06 UTC (permalink / raw) To: linux-usb; +Cc: linux-media, Andrzej Pietrasiewicz, Michael Grzeschik Simplify ioctl handling by using video_ioctl2. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> --- drivers/usb/gadget/function/f_uvc.c | 1 + drivers/usb/gadget/function/uvc_v4l2.c | 298 +++++++++++++++++---------------- 2 files changed, 158 insertions(+), 141 deletions(-) diff --git a/drivers/usb/gadget/function/f_uvc.c b/drivers/usb/gadget/function/f_uvc.c index e9d625b..0b86aea 100644 --- a/drivers/usb/gadget/function/f_uvc.c +++ b/drivers/usb/gadget/function/f_uvc.c @@ -414,6 +414,7 @@ uvc_register_video(struct uvc_device *uvc) video->v4l2_dev = &uvc->v4l2_dev; video->fops = &uvc_v4l2_fops; + video->ioctl_ops = &uvc_v4l2_ioctl_ops; video->release = video_device_release; strlcpy(video->name, cdev->gadget->name, sizeof(video->name)); diff --git a/drivers/usb/gadget/function/uvc_v4l2.c b/drivers/usb/gadget/function/uvc_v4l2.c index f22b878..14c3a37 100644 --- a/drivers/usb/gadget/function/uvc_v4l2.c +++ b/drivers/usb/gadget/function/uvc_v4l2.c @@ -48,7 +48,7 @@ uvc_send_response(struct uvc_device *uvc, struct uvc_request_data *data) } /* -------------------------------------------------------------------------- - * V4L2 + * V4L2 ioctls */ struct uvc_format @@ -63,8 +63,29 @@ static struct uvc_format uvc_formats[] = { }; static int -uvc_v4l2_get_format(struct uvc_video *video, struct v4l2_format *fmt) +uvc_v4l2_querycap(struct file *file, void *fh, struct v4l2_capability *cap) +{ + struct video_device *vdev = video_devdata(file); + struct uvc_device *uvc = video_get_drvdata(vdev); + struct usb_composite_dev *cdev = uvc->func.config->cdev; + + strlcpy(cap->driver, "g_uvc", sizeof(cap->driver)); + strlcpy(cap->card, cdev->gadget->name, sizeof(cap->card)); + strlcpy(cap->bus_info, dev_name(&cdev->gadget->dev), + sizeof(cap->bus_info)); + + cap->capabilities = V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_STREAMING; + + return 0; +} + +static int +uvc_v4l2_get_format(struct file *file, void *fh, struct v4l2_format *fmt) { + struct video_device *vdev = video_devdata(file); + struct uvc_device *uvc = video_get_drvdata(vdev); + struct uvc_video *video = &uvc->video; + fmt->fmt.pix.pixelformat = video->fcc; fmt->fmt.pix.width = video->width; fmt->fmt.pix.height = video->height; @@ -78,8 +99,11 @@ uvc_v4l2_get_format(struct uvc_video *video, struct v4l2_format *fmt) } static int -uvc_v4l2_set_format(struct uvc_video *video, struct v4l2_format *fmt) +uvc_v4l2_set_format(struct file *file, void *fh, struct v4l2_format *fmt) { + struct video_device *vdev = video_devdata(file); + struct uvc_device *uvc = video_get_drvdata(vdev); + struct uvc_video *video = &uvc->video; struct uvc_format *format; unsigned int imagesize; unsigned int bpl; @@ -116,192 +140,184 @@ uvc_v4l2_set_format(struct uvc_video *video, struct v4l2_format *fmt) } static int -uvc_v4l2_open(struct file *file) +uvc_v4l2_reqbufs(struct file *file, void *fh, struct v4l2_requestbuffers *b) { struct video_device *vdev = video_devdata(file); struct uvc_device *uvc = video_get_drvdata(vdev); - struct uvc_file_handle *handle; - - handle = kzalloc(sizeof(*handle), GFP_KERNEL); - if (handle == NULL) - return -ENOMEM; - - v4l2_fh_init(&handle->vfh, vdev); - v4l2_fh_add(&handle->vfh); + struct uvc_video *video = &uvc->video; - handle->device = &uvc->video; - file->private_data = &handle->vfh; + if (b->type != video->queue.queue.type) + return -EINVAL; - uvc_function_connect(uvc); - return 0; + return uvc_alloc_buffers(&video->queue, b); } static int -uvc_v4l2_release(struct file *file) +uvc_v4l2_querybuf(struct file *file, void *fh, struct v4l2_buffer *b) { struct video_device *vdev = video_devdata(file); struct uvc_device *uvc = video_get_drvdata(vdev); - struct uvc_file_handle *handle = to_uvc_file_handle(file->private_data); - struct uvc_video *video = handle->device; - - uvc_function_disconnect(uvc); - - uvc_video_enable(video, 0); - uvc_free_buffers(&video->queue); - - file->private_data = NULL; - v4l2_fh_del(&handle->vfh); - v4l2_fh_exit(&handle->vfh); - kfree(handle); + struct uvc_video *video = &uvc->video; - return 0; + return uvc_query_buffer(&video->queue, b); } -static long -uvc_v4l2_do_ioctl(struct file *file, unsigned int cmd, void *arg) +static int +uvc_v4l2_qbuf(struct file *file, void *fh, struct v4l2_buffer *b) { struct video_device *vdev = video_devdata(file); struct uvc_device *uvc = video_get_drvdata(vdev); - struct uvc_file_handle *handle = to_uvc_file_handle(file->private_data); - struct usb_composite_dev *cdev = uvc->func.config->cdev; struct uvc_video *video = &uvc->video; - int ret = 0; - - switch (cmd) { - /* Query capabilities */ - case VIDIOC_QUERYCAP: - { - struct v4l2_capability *cap = arg; - - memset(cap, 0, sizeof *cap); - strlcpy(cap->driver, "g_uvc", sizeof(cap->driver)); - strlcpy(cap->card, cdev->gadget->name, sizeof(cap->card)); - strlcpy(cap->bus_info, dev_name(&cdev->gadget->dev), - sizeof cap->bus_info); - cap->version = LINUX_VERSION_CODE; - cap->capabilities = V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_STREAMING; - break; - } - - /* Get & Set format */ - case VIDIOC_G_FMT: - { - struct v4l2_format *fmt = arg; + int ret; - if (fmt->type != video->queue.queue.type) - return -EINVAL; - - return uvc_v4l2_get_format(video, fmt); - } + ret = uvc_queue_buffer(&video->queue, b); + if (ret < 0) + return ret; - case VIDIOC_S_FMT: - { - struct v4l2_format *fmt = arg; + return uvc_video_pump(video); +} - if (fmt->type != video->queue.queue.type) - return -EINVAL; +static int +uvc_v4l2_dqbuf(struct file *file, void *fh, struct v4l2_buffer *b) +{ + struct video_device *vdev = video_devdata(file); + struct uvc_device *uvc = video_get_drvdata(vdev); + struct uvc_video *video = &uvc->video; - return uvc_v4l2_set_format(video, fmt); - } + return uvc_dequeue_buffer(&video->queue, b, file->f_flags & O_NONBLOCK); +} - /* Buffers & streaming */ - case VIDIOC_REQBUFS: - { - struct v4l2_requestbuffers *rb = arg; +static int +uvc_v4l2_streamon(struct file *file, void *fh, enum v4l2_buf_type type) +{ + struct video_device *vdev = video_devdata(file); + struct uvc_device *uvc = video_get_drvdata(vdev); + struct uvc_video *video = &uvc->video; + int ret; - if (rb->type != video->queue.queue.type) - return -EINVAL; + if (type != video->queue.queue.type) + return -EINVAL; - ret = uvc_alloc_buffers(&video->queue, rb); - if (ret < 0) - return ret; + /* Enable UVC video. */ + ret = uvc_video_enable(video, 1); + if (ret < 0) + return ret; - ret = 0; - break; - } + /* + * Complete the alternate setting selection setup phase now that + * userspace is ready to provide video frames. + */ + uvc_function_setup_continue(uvc); + uvc->state = UVC_STATE_STREAMING; - case VIDIOC_QUERYBUF: - { - struct v4l2_buffer *buf = arg; + return 0; +} - return uvc_query_buffer(&video->queue, buf); - } +static int +uvc_v4l2_streamoff(struct file *file, void *fh, enum v4l2_buf_type type) +{ + struct video_device *vdev = video_devdata(file); + struct uvc_device *uvc = video_get_drvdata(vdev); + struct uvc_video *video = &uvc->video; - case VIDIOC_QBUF: - if ((ret = uvc_queue_buffer(&video->queue, arg)) < 0) - return ret; + if (type != video->queue.queue.type) + return -EINVAL; - return uvc_video_pump(video); + return uvc_video_enable(video, 0); +} - case VIDIOC_DQBUF: - return uvc_dequeue_buffer(&video->queue, arg, - file->f_flags & O_NONBLOCK); +static int +uvc_v4l2_subscribe_event(struct v4l2_fh *fh, + const struct v4l2_event_subscription *sub) +{ + if (sub->type < UVC_EVENT_FIRST || sub->type > UVC_EVENT_LAST) + return -EINVAL; - case VIDIOC_STREAMON: - { - int *type = arg; + return v4l2_event_subscribe(fh, sub, 2, NULL); +} - if (*type != video->queue.queue.type) - return -EINVAL; +static int +uvc_v4l2_unsubscribe_event(struct v4l2_fh *fh, + const struct v4l2_event_subscription *sub) +{ + return v4l2_event_unsubscribe(fh, sub); +} - /* Enable UVC video. */ - ret = uvc_video_enable(video, 1); - if (ret < 0) - return ret; +static long +uvc_v4l2_ioctl_default(struct file *file, void *fh, bool valid_prio, + unsigned int cmd, void *arg) +{ + struct video_device *vdev = video_devdata(file); + struct uvc_device *uvc = video_get_drvdata(vdev); - /* - * Complete the alternate setting selection setup phase now that - * userspace is ready to provide video frames. - */ - uvc_function_setup_continue(uvc); - uvc->state = UVC_STATE_STREAMING; + switch (cmd) { + case UVCIOC_SEND_RESPONSE: + return uvc_send_response(uvc, arg); - return 0; + default: + return -ENOIOCTLCMD; } +} - case VIDIOC_STREAMOFF: - { - int *type = arg; +static const struct v4l2_ioctl_ops uvc_v4l2_ioctl_ops = { + .vidioc_querycap = uvc_v4l2_querycap, + .vidioc_g_fmt_vid_out = uvc_v4l2_get_format, + .vidioc_s_fmt_vid_out = uvc_v4l2_set_format, + .vidioc_reqbufs = uvc_v4l2_reqbufs, + .vidioc_querybuf = uvc_v4l2_querybuf, + .vidioc_qbuf = uvc_v4l2_qbuf, + .vidioc_dqbuf = uvc_v4l2_dqbuf, + .vidioc_streamon = uvc_v4l2_streamon, + .vidioc_streamoff = uvc_v4l2_streamoff, + .vidioc_subscribe_event = uvc_v4l2_subscribe_event, + .vidioc_unsubscribe_event = uvc_v4l2_unsubscribe_event, + .vidioc_default = uvc_v4l2_ioctl_default, +}; - if (*type != video->queue.queue.type) - return -EINVAL; +/* -------------------------------------------------------------------------- + * V4L2 + */ - return uvc_video_enable(video, 0); - } +static int +uvc_v4l2_open(struct file *file) +{ + struct video_device *vdev = video_devdata(file); + struct uvc_device *uvc = video_get_drvdata(vdev); + struct uvc_file_handle *handle; - /* Events */ - case VIDIOC_DQEVENT: - return v4l2_event_dequeue(&handle->vfh, arg, - file->f_flags & O_NONBLOCK); + handle = kzalloc(sizeof(*handle), GFP_KERNEL); + if (handle == NULL) + return -ENOMEM; - case VIDIOC_SUBSCRIBE_EVENT: - { - struct v4l2_event_subscription *sub = arg; + v4l2_fh_init(&handle->vfh, vdev); + v4l2_fh_add(&handle->vfh); - if (sub->type < UVC_EVENT_FIRST || sub->type > UVC_EVENT_LAST) - return -EINVAL; + handle->device = &uvc->video; + file->private_data = &handle->vfh; - return v4l2_event_subscribe(&handle->vfh, arg, 2, NULL); - } + uvc_function_connect(uvc); + return 0; +} - case VIDIOC_UNSUBSCRIBE_EVENT: - return v4l2_event_unsubscribe(&handle->vfh, arg); +static int +uvc_v4l2_release(struct file *file) +{ + struct video_device *vdev = video_devdata(file); + struct uvc_device *uvc = video_get_drvdata(vdev); + struct uvc_file_handle *handle = to_uvc_file_handle(file->private_data); + struct uvc_video *video = handle->device; - case UVCIOC_SEND_RESPONSE: - ret = uvc_send_response(uvc, arg); - break; + uvc_function_disconnect(uvc); - default: - return -ENOIOCTLCMD; - } + uvc_video_enable(video, 0); + uvc_free_buffers(&video->queue); - return ret; -} + file->private_data = NULL; + v4l2_fh_del(&handle->vfh); + v4l2_fh_exit(&handle->vfh); + kfree(handle); -static long -uvc_v4l2_ioctl(struct file *file, unsigned int cmd, unsigned long arg) -{ - return video_usercopy(file, cmd, arg, uvc_v4l2_do_ioctl); + return 0; } static int @@ -338,7 +354,7 @@ static struct v4l2_file_operations uvc_v4l2_fops = { .owner = THIS_MODULE, .open = uvc_v4l2_open, .release = uvc_v4l2_release, - .ioctl = uvc_v4l2_ioctl, + .ioctl = video_ioctl2, .mmap = uvc_v4l2_mmap, .poll = uvc_v4l2_poll, #ifndef CONFIG_MMU -- 1.8.5.5 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH 2/2] usb: gadget: f_uvc: Move to video_ioctl2 2014-08-18 17:06 ` [PATCH 2/2] usb: gadget: f_uvc: Move to video_ioctl2 Laurent Pinchart @ 2014-08-18 18:24 ` Hans Verkuil 2014-08-18 21:16 ` Laurent Pinchart 2014-08-27 15:16 ` [PATCH] usb: gadget: f_uvc fix transition " Andrzej Pietrasiewicz 1 sibling, 1 reply; 11+ messages in thread From: Hans Verkuil @ 2014-08-18 18:24 UTC (permalink / raw) To: Laurent Pinchart, linux-usb Cc: linux-media, Andrzej Pietrasiewicz, Michael Grzeschik On 08/18/2014 05:06 PM, Laurent Pinchart wrote: > Simplify ioctl handling by using video_ioctl2. Are you able to test this on actual hardware? And if so, can you run v4l2-compliance? Regards, Hans > > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- > drivers/usb/gadget/function/f_uvc.c | 1 + > drivers/usb/gadget/function/uvc_v4l2.c | 298 +++++++++++++++++---------------- > 2 files changed, 158 insertions(+), 141 deletions(-) > > diff --git a/drivers/usb/gadget/function/f_uvc.c b/drivers/usb/gadget/function/f_uvc.c > index e9d625b..0b86aea 100644 > --- a/drivers/usb/gadget/function/f_uvc.c > +++ b/drivers/usb/gadget/function/f_uvc.c > @@ -414,6 +414,7 @@ uvc_register_video(struct uvc_device *uvc) > > video->v4l2_dev = &uvc->v4l2_dev; > video->fops = &uvc_v4l2_fops; > + video->ioctl_ops = &uvc_v4l2_ioctl_ops; > video->release = video_device_release; > strlcpy(video->name, cdev->gadget->name, sizeof(video->name)); > > diff --git a/drivers/usb/gadget/function/uvc_v4l2.c b/drivers/usb/gadget/function/uvc_v4l2.c > index f22b878..14c3a37 100644 > --- a/drivers/usb/gadget/function/uvc_v4l2.c > +++ b/drivers/usb/gadget/function/uvc_v4l2.c > @@ -48,7 +48,7 @@ uvc_send_response(struct uvc_device *uvc, struct uvc_request_data *data) > } > > /* -------------------------------------------------------------------------- > - * V4L2 > + * V4L2 ioctls > */ > > struct uvc_format > @@ -63,8 +63,29 @@ static struct uvc_format uvc_formats[] = { > }; > > static int > -uvc_v4l2_get_format(struct uvc_video *video, struct v4l2_format *fmt) > +uvc_v4l2_querycap(struct file *file, void *fh, struct v4l2_capability *cap) > +{ > + struct video_device *vdev = video_devdata(file); > + struct uvc_device *uvc = video_get_drvdata(vdev); > + struct usb_composite_dev *cdev = uvc->func.config->cdev; > + > + strlcpy(cap->driver, "g_uvc", sizeof(cap->driver)); > + strlcpy(cap->card, cdev->gadget->name, sizeof(cap->card)); > + strlcpy(cap->bus_info, dev_name(&cdev->gadget->dev), > + sizeof(cap->bus_info)); > + > + cap->capabilities = V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_STREAMING; > + > + return 0; > +} > + > +static int > +uvc_v4l2_get_format(struct file *file, void *fh, struct v4l2_format *fmt) > { > + struct video_device *vdev = video_devdata(file); > + struct uvc_device *uvc = video_get_drvdata(vdev); > + struct uvc_video *video = &uvc->video; > + > fmt->fmt.pix.pixelformat = video->fcc; > fmt->fmt.pix.width = video->width; > fmt->fmt.pix.height = video->height; > @@ -78,8 +99,11 @@ uvc_v4l2_get_format(struct uvc_video *video, struct v4l2_format *fmt) > } > > static int > -uvc_v4l2_set_format(struct uvc_video *video, struct v4l2_format *fmt) > +uvc_v4l2_set_format(struct file *file, void *fh, struct v4l2_format *fmt) > { > + struct video_device *vdev = video_devdata(file); > + struct uvc_device *uvc = video_get_drvdata(vdev); > + struct uvc_video *video = &uvc->video; > struct uvc_format *format; > unsigned int imagesize; > unsigned int bpl; > @@ -116,192 +140,184 @@ uvc_v4l2_set_format(struct uvc_video *video, struct v4l2_format *fmt) > } > > static int > -uvc_v4l2_open(struct file *file) > +uvc_v4l2_reqbufs(struct file *file, void *fh, struct v4l2_requestbuffers *b) > { > struct video_device *vdev = video_devdata(file); > struct uvc_device *uvc = video_get_drvdata(vdev); > - struct uvc_file_handle *handle; > - > - handle = kzalloc(sizeof(*handle), GFP_KERNEL); > - if (handle == NULL) > - return -ENOMEM; > - > - v4l2_fh_init(&handle->vfh, vdev); > - v4l2_fh_add(&handle->vfh); > + struct uvc_video *video = &uvc->video; > > - handle->device = &uvc->video; > - file->private_data = &handle->vfh; > + if (b->type != video->queue.queue.type) > + return -EINVAL; > > - uvc_function_connect(uvc); > - return 0; > + return uvc_alloc_buffers(&video->queue, b); > } > > static int > -uvc_v4l2_release(struct file *file) > +uvc_v4l2_querybuf(struct file *file, void *fh, struct v4l2_buffer *b) > { > struct video_device *vdev = video_devdata(file); > struct uvc_device *uvc = video_get_drvdata(vdev); > - struct uvc_file_handle *handle = to_uvc_file_handle(file->private_data); > - struct uvc_video *video = handle->device; > - > - uvc_function_disconnect(uvc); > - > - uvc_video_enable(video, 0); > - uvc_free_buffers(&video->queue); > - > - file->private_data = NULL; > - v4l2_fh_del(&handle->vfh); > - v4l2_fh_exit(&handle->vfh); > - kfree(handle); > + struct uvc_video *video = &uvc->video; > > - return 0; > + return uvc_query_buffer(&video->queue, b); > } > > -static long > -uvc_v4l2_do_ioctl(struct file *file, unsigned int cmd, void *arg) > +static int > +uvc_v4l2_qbuf(struct file *file, void *fh, struct v4l2_buffer *b) > { > struct video_device *vdev = video_devdata(file); > struct uvc_device *uvc = video_get_drvdata(vdev); > - struct uvc_file_handle *handle = to_uvc_file_handle(file->private_data); > - struct usb_composite_dev *cdev = uvc->func.config->cdev; > struct uvc_video *video = &uvc->video; > - int ret = 0; > - > - switch (cmd) { > - /* Query capabilities */ > - case VIDIOC_QUERYCAP: > - { > - struct v4l2_capability *cap = arg; > - > - memset(cap, 0, sizeof *cap); > - strlcpy(cap->driver, "g_uvc", sizeof(cap->driver)); > - strlcpy(cap->card, cdev->gadget->name, sizeof(cap->card)); > - strlcpy(cap->bus_info, dev_name(&cdev->gadget->dev), > - sizeof cap->bus_info); > - cap->version = LINUX_VERSION_CODE; > - cap->capabilities = V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_STREAMING; > - break; > - } > - > - /* Get & Set format */ > - case VIDIOC_G_FMT: > - { > - struct v4l2_format *fmt = arg; > + int ret; > > - if (fmt->type != video->queue.queue.type) > - return -EINVAL; > - > - return uvc_v4l2_get_format(video, fmt); > - } > + ret = uvc_queue_buffer(&video->queue, b); > + if (ret < 0) > + return ret; > > - case VIDIOC_S_FMT: > - { > - struct v4l2_format *fmt = arg; > + return uvc_video_pump(video); > +} > > - if (fmt->type != video->queue.queue.type) > - return -EINVAL; > +static int > +uvc_v4l2_dqbuf(struct file *file, void *fh, struct v4l2_buffer *b) > +{ > + struct video_device *vdev = video_devdata(file); > + struct uvc_device *uvc = video_get_drvdata(vdev); > + struct uvc_video *video = &uvc->video; > > - return uvc_v4l2_set_format(video, fmt); > - } > + return uvc_dequeue_buffer(&video->queue, b, file->f_flags & O_NONBLOCK); > +} > > - /* Buffers & streaming */ > - case VIDIOC_REQBUFS: > - { > - struct v4l2_requestbuffers *rb = arg; > +static int > +uvc_v4l2_streamon(struct file *file, void *fh, enum v4l2_buf_type type) > +{ > + struct video_device *vdev = video_devdata(file); > + struct uvc_device *uvc = video_get_drvdata(vdev); > + struct uvc_video *video = &uvc->video; > + int ret; > > - if (rb->type != video->queue.queue.type) > - return -EINVAL; > + if (type != video->queue.queue.type) > + return -EINVAL; > > - ret = uvc_alloc_buffers(&video->queue, rb); > - if (ret < 0) > - return ret; > + /* Enable UVC video. */ > + ret = uvc_video_enable(video, 1); > + if (ret < 0) > + return ret; > > - ret = 0; > - break; > - } > + /* > + * Complete the alternate setting selection setup phase now that > + * userspace is ready to provide video frames. > + */ > + uvc_function_setup_continue(uvc); > + uvc->state = UVC_STATE_STREAMING; > > - case VIDIOC_QUERYBUF: > - { > - struct v4l2_buffer *buf = arg; > + return 0; > +} > > - return uvc_query_buffer(&video->queue, buf); > - } > +static int > +uvc_v4l2_streamoff(struct file *file, void *fh, enum v4l2_buf_type type) > +{ > + struct video_device *vdev = video_devdata(file); > + struct uvc_device *uvc = video_get_drvdata(vdev); > + struct uvc_video *video = &uvc->video; > > - case VIDIOC_QBUF: > - if ((ret = uvc_queue_buffer(&video->queue, arg)) < 0) > - return ret; > + if (type != video->queue.queue.type) > + return -EINVAL; > > - return uvc_video_pump(video); > + return uvc_video_enable(video, 0); > +} > > - case VIDIOC_DQBUF: > - return uvc_dequeue_buffer(&video->queue, arg, > - file->f_flags & O_NONBLOCK); > +static int > +uvc_v4l2_subscribe_event(struct v4l2_fh *fh, > + const struct v4l2_event_subscription *sub) > +{ > + if (sub->type < UVC_EVENT_FIRST || sub->type > UVC_EVENT_LAST) > + return -EINVAL; > > - case VIDIOC_STREAMON: > - { > - int *type = arg; > + return v4l2_event_subscribe(fh, sub, 2, NULL); > +} > > - if (*type != video->queue.queue.type) > - return -EINVAL; > +static int > +uvc_v4l2_unsubscribe_event(struct v4l2_fh *fh, > + const struct v4l2_event_subscription *sub) > +{ > + return v4l2_event_unsubscribe(fh, sub); > +} > > - /* Enable UVC video. */ > - ret = uvc_video_enable(video, 1); > - if (ret < 0) > - return ret; > +static long > +uvc_v4l2_ioctl_default(struct file *file, void *fh, bool valid_prio, > + unsigned int cmd, void *arg) > +{ > + struct video_device *vdev = video_devdata(file); > + struct uvc_device *uvc = video_get_drvdata(vdev); > > - /* > - * Complete the alternate setting selection setup phase now that > - * userspace is ready to provide video frames. > - */ > - uvc_function_setup_continue(uvc); > - uvc->state = UVC_STATE_STREAMING; > + switch (cmd) { > + case UVCIOC_SEND_RESPONSE: > + return uvc_send_response(uvc, arg); > > - return 0; > + default: > + return -ENOIOCTLCMD; > } > +} > > - case VIDIOC_STREAMOFF: > - { > - int *type = arg; > +static const struct v4l2_ioctl_ops uvc_v4l2_ioctl_ops = { > + .vidioc_querycap = uvc_v4l2_querycap, > + .vidioc_g_fmt_vid_out = uvc_v4l2_get_format, > + .vidioc_s_fmt_vid_out = uvc_v4l2_set_format, > + .vidioc_reqbufs = uvc_v4l2_reqbufs, > + .vidioc_querybuf = uvc_v4l2_querybuf, > + .vidioc_qbuf = uvc_v4l2_qbuf, > + .vidioc_dqbuf = uvc_v4l2_dqbuf, > + .vidioc_streamon = uvc_v4l2_streamon, > + .vidioc_streamoff = uvc_v4l2_streamoff, > + .vidioc_subscribe_event = uvc_v4l2_subscribe_event, > + .vidioc_unsubscribe_event = uvc_v4l2_unsubscribe_event, > + .vidioc_default = uvc_v4l2_ioctl_default, > +}; > > - if (*type != video->queue.queue.type) > - return -EINVAL; > +/* -------------------------------------------------------------------------- > + * V4L2 > + */ > > - return uvc_video_enable(video, 0); > - } > +static int > +uvc_v4l2_open(struct file *file) > +{ > + struct video_device *vdev = video_devdata(file); > + struct uvc_device *uvc = video_get_drvdata(vdev); > + struct uvc_file_handle *handle; > > - /* Events */ > - case VIDIOC_DQEVENT: > - return v4l2_event_dequeue(&handle->vfh, arg, > - file->f_flags & O_NONBLOCK); > + handle = kzalloc(sizeof(*handle), GFP_KERNEL); > + if (handle == NULL) > + return -ENOMEM; > > - case VIDIOC_SUBSCRIBE_EVENT: > - { > - struct v4l2_event_subscription *sub = arg; > + v4l2_fh_init(&handle->vfh, vdev); > + v4l2_fh_add(&handle->vfh); > > - if (sub->type < UVC_EVENT_FIRST || sub->type > UVC_EVENT_LAST) > - return -EINVAL; > + handle->device = &uvc->video; > + file->private_data = &handle->vfh; > > - return v4l2_event_subscribe(&handle->vfh, arg, 2, NULL); > - } > + uvc_function_connect(uvc); > + return 0; > +} > > - case VIDIOC_UNSUBSCRIBE_EVENT: > - return v4l2_event_unsubscribe(&handle->vfh, arg); > +static int > +uvc_v4l2_release(struct file *file) > +{ > + struct video_device *vdev = video_devdata(file); > + struct uvc_device *uvc = video_get_drvdata(vdev); > + struct uvc_file_handle *handle = to_uvc_file_handle(file->private_data); > + struct uvc_video *video = handle->device; > > - case UVCIOC_SEND_RESPONSE: > - ret = uvc_send_response(uvc, arg); > - break; > + uvc_function_disconnect(uvc); > > - default: > - return -ENOIOCTLCMD; > - } > + uvc_video_enable(video, 0); > + uvc_free_buffers(&video->queue); > > - return ret; > -} > + file->private_data = NULL; > + v4l2_fh_del(&handle->vfh); > + v4l2_fh_exit(&handle->vfh); > + kfree(handle); > > -static long > -uvc_v4l2_ioctl(struct file *file, unsigned int cmd, unsigned long arg) > -{ > - return video_usercopy(file, cmd, arg, uvc_v4l2_do_ioctl); > + return 0; > } > > static int > @@ -338,7 +354,7 @@ static struct v4l2_file_operations uvc_v4l2_fops = { > .owner = THIS_MODULE, > .open = uvc_v4l2_open, > .release = uvc_v4l2_release, > - .ioctl = uvc_v4l2_ioctl, > + .ioctl = video_ioctl2, > .mmap = uvc_v4l2_mmap, > .poll = uvc_v4l2_poll, > #ifndef CONFIG_MMU > ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 2/2] usb: gadget: f_uvc: Move to video_ioctl2 2014-08-18 18:24 ` Hans Verkuil @ 2014-08-18 21:16 ` Laurent Pinchart 2014-08-20 7:55 ` Michael Grzeschik 0 siblings, 1 reply; 11+ messages in thread From: Laurent Pinchart @ 2014-08-18 21:16 UTC (permalink / raw) To: Hans Verkuil Cc: linux-usb, linux-media, Andrzej Pietrasiewicz, Michael Grzeschik Hi Hans, On Monday 18 August 2014 18:24:26 Hans Verkuil wrote: > On 08/18/2014 05:06 PM, Laurent Pinchart wrote: > > Simplify ioctl handling by using video_ioctl2. > > Are you able to test this on actual hardware? And if so, can you run > v4l2-compliance? I'm afraid not. I don't have a platform with an up and running USB peripheral controller at the moment. -- Regards, Laurent Pinchart ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 2/2] usb: gadget: f_uvc: Move to video_ioctl2 2014-08-18 21:16 ` Laurent Pinchart @ 2014-08-20 7:55 ` Michael Grzeschik 2014-08-20 17:04 ` Laurent Pinchart 0 siblings, 1 reply; 11+ messages in thread From: Michael Grzeschik @ 2014-08-20 7:55 UTC (permalink / raw) To: Laurent Pinchart Cc: Hans Verkuil, linux-usb, linux-media, Andrzej Pietrasiewicz On Mon, Aug 18, 2014 at 11:16:36PM +0200, Laurent Pinchart wrote: > Hi Hans, > > On Monday 18 August 2014 18:24:26 Hans Verkuil wrote: > > On 08/18/2014 05:06 PM, Laurent Pinchart wrote: > > > Simplify ioctl handling by using video_ioctl2. > > > > Are you able to test this on actual hardware? And if so, can you run > > v4l2-compliance? > > I'm afraid not. I don't have a platform with an up and running USB peripheral > controller at the moment. You could test it with dummy_hcd gadget on an virtual or non usb machine. Regards, Michael -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 2/2] usb: gadget: f_uvc: Move to video_ioctl2 2014-08-20 7:55 ` Michael Grzeschik @ 2014-08-20 17:04 ` Laurent Pinchart 0 siblings, 0 replies; 11+ messages in thread From: Laurent Pinchart @ 2014-08-20 17:04 UTC (permalink / raw) To: Michael Grzeschik Cc: Hans Verkuil, linux-usb, linux-media, Andrzej Pietrasiewicz Hi Michael, On Wednesday 20 August 2014 09:55:10 Michael Grzeschik wrote: > On Mon, Aug 18, 2014 at 11:16:36PM +0200, Laurent Pinchart wrote: > > On Monday 18 August 2014 18:24:26 Hans Verkuil wrote: > > > On 08/18/2014 05:06 PM, Laurent Pinchart wrote: > > > > Simplify ioctl handling by using video_ioctl2. > > > > > > Are you able to test this on actual hardware? And if so, can you run > > > v4l2-compliance? > > > > I'm afraid not. I don't have a platform with an up and running USB > > peripheral controller at the moment. > > You could test it with dummy_hcd gadget on an virtual or non usb machine. Thank you for pointing this out. -- Regards, Laurent Pinchart ^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH] usb: gadget: f_uvc fix transition to video_ioctl2 2014-08-18 17:06 ` [PATCH 2/2] usb: gadget: f_uvc: Move to video_ioctl2 Laurent Pinchart 2014-08-18 18:24 ` Hans Verkuil @ 2014-08-27 15:16 ` Andrzej Pietrasiewicz 2014-08-28 11:28 ` Laurent Pinchart 1 sibling, 1 reply; 11+ messages in thread From: Andrzej Pietrasiewicz @ 2014-08-27 15:16 UTC (permalink / raw) To: linux-usb, linux-media Cc: Andrzej Pietrasiewicz, Felipe Balbi, Greg Kroah-Hartman, Marek Szyprowski, Laurent Pinchart UVC video node is a TX device from the point of view of the gadget, so we cannot rely on the video struct being filled with zeros, because VFL_DIR_TX is actually 1. Suggested-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@samsung.com> --- drivers/usb/gadget/function/f_uvc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/usb/gadget/function/f_uvc.c b/drivers/usb/gadget/function/f_uvc.c index 5209105..95dc1c6 100644 --- a/drivers/usb/gadget/function/f_uvc.c +++ b/drivers/usb/gadget/function/f_uvc.c @@ -411,6 +411,7 @@ uvc_register_video(struct uvc_device *uvc) video->fops = &uvc_v4l2_fops; video->ioctl_ops = &uvc_v4l2_ioctl_ops; video->release = video_device_release; + video->vfl_dir = VFL_DIR_TX; strlcpy(video->name, cdev->gadget->name, sizeof(video->name)); uvc->vdev = video; -- 1.9.1 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH] usb: gadget: f_uvc fix transition to video_ioctl2 2014-08-27 15:16 ` [PATCH] usb: gadget: f_uvc fix transition " Andrzej Pietrasiewicz @ 2014-08-28 11:28 ` Laurent Pinchart 2014-08-28 14:39 ` Andrzej Pietrasiewicz 0 siblings, 1 reply; 11+ messages in thread From: Laurent Pinchart @ 2014-08-28 11:28 UTC (permalink / raw) To: Andrzej Pietrasiewicz Cc: linux-usb, linux-media, Felipe Balbi, Greg Kroah-Hartman, Marek Szyprowski Hi Andrzej, Thank you for the patch. On Wednesday 27 August 2014 17:16:38 Andrzej Pietrasiewicz wrote: > UVC video node is a TX device from the point of view of the gadget, > so we cannot rely on the video struct being filled with zeros, because > VFL_DIR_TX is actually 1. > > Suggested-by: Sylwester Nawrocki <s.nawrocki@samsung.com> > Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@samsung.com> > --- > drivers/usb/gadget/function/f_uvc.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/usb/gadget/function/f_uvc.c > b/drivers/usb/gadget/function/f_uvc.c index 5209105..95dc1c6 100644 > --- a/drivers/usb/gadget/function/f_uvc.c > +++ b/drivers/usb/gadget/function/f_uvc.c > @@ -411,6 +411,7 @@ uvc_register_video(struct uvc_device *uvc) > video->fops = &uvc_v4l2_fops; > video->ioctl_ops = &uvc_v4l2_ioctl_ops; > video->release = video_device_release; > + video->vfl_dir = VFL_DIR_TX; Do you have any objection against squashing this patch into "usb: gadget: f_uvc: Move to video_ioctl2" ? > strlcpy(video->name, cdev->gadget->name, sizeof(video->name)); > > uvc->vdev = video; -- Regards, Laurent Pinchart ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH] usb: gadget: f_uvc fix transition to video_ioctl2 2014-08-28 11:28 ` Laurent Pinchart @ 2014-08-28 14:39 ` Andrzej Pietrasiewicz 2014-08-28 14:48 ` Felipe Balbi 0 siblings, 1 reply; 11+ messages in thread From: Andrzej Pietrasiewicz @ 2014-08-28 14:39 UTC (permalink / raw) To: Laurent Pinchart Cc: linux-usb, linux-media, Felipe Balbi, Greg Kroah-Hartman, Marek Szyprowski W dniu 28.08.2014 o 13:28, Laurent Pinchart pisze: <snip> >> diff --git a/drivers/usb/gadget/function/f_uvc.c >> b/drivers/usb/gadget/function/f_uvc.c index 5209105..95dc1c6 100644 >> --- a/drivers/usb/gadget/function/f_uvc.c >> +++ b/drivers/usb/gadget/function/f_uvc.c >> @@ -411,6 +411,7 @@ uvc_register_video(struct uvc_device *uvc) >> video->fops = &uvc_v4l2_fops; >> video->ioctl_ops = &uvc_v4l2_ioctl_ops; >> video->release = video_device_release; >> + video->vfl_dir = VFL_DIR_TX; > > Do you have any objection against squashing this patch into "usb: gadget: > f_uvc: Move to video_ioctl2" ? > Not at all. Feel free to squash it. AP ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH] usb: gadget: f_uvc fix transition to video_ioctl2 2014-08-28 14:39 ` Andrzej Pietrasiewicz @ 2014-08-28 14:48 ` Felipe Balbi 0 siblings, 0 replies; 11+ messages in thread From: Felipe Balbi @ 2014-08-28 14:48 UTC (permalink / raw) To: Andrzej Pietrasiewicz Cc: Laurent Pinchart, linux-usb, linux-media, Felipe Balbi, Greg Kroah-Hartman, Marek Szyprowski [-- Attachment #1: Type: text/plain, Size: 843 bytes --] On Thu, Aug 28, 2014 at 04:39:27PM +0200, Andrzej Pietrasiewicz wrote: > W dniu 28.08.2014 o 13:28, Laurent Pinchart pisze: > > <snip> > > >>diff --git a/drivers/usb/gadget/function/f_uvc.c > >>b/drivers/usb/gadget/function/f_uvc.c index 5209105..95dc1c6 100644 > >>--- a/drivers/usb/gadget/function/f_uvc.c > >>+++ b/drivers/usb/gadget/function/f_uvc.c > >>@@ -411,6 +411,7 @@ uvc_register_video(struct uvc_device *uvc) > >> video->fops = &uvc_v4l2_fops; > >> video->ioctl_ops = &uvc_v4l2_ioctl_ops; > >> video->release = video_device_release; > >>+ video->vfl_dir = VFL_DIR_TX; > > > >Do you have any objection against squashing this patch into "usb: gadget: > >f_uvc: Move to video_ioctl2" ? > > > Not at all. Feel free to squash it. This is in my testing/fixes, though. I'll drop it from there. -- balbi [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 819 bytes --] ^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2014-08-28 14:48 UTC | newest] Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2014-08-18 17:06 [PATCH 0/2] Move UVC gagdet to video_ioctl2 Laurent Pinchart 2014-08-18 17:06 ` [PATCH 1/2] usb: gadget: f_uvc: Store EP0 control request state during setup stage Laurent Pinchart 2014-08-18 17:06 ` [PATCH 2/2] usb: gadget: f_uvc: Move to video_ioctl2 Laurent Pinchart 2014-08-18 18:24 ` Hans Verkuil 2014-08-18 21:16 ` Laurent Pinchart 2014-08-20 7:55 ` Michael Grzeschik 2014-08-20 17:04 ` Laurent Pinchart 2014-08-27 15:16 ` [PATCH] usb: gadget: f_uvc fix transition " Andrzej Pietrasiewicz 2014-08-28 11:28 ` Laurent Pinchart 2014-08-28 14:39 ` Andrzej Pietrasiewicz 2014-08-28 14:48 ` Felipe Balbi
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.