From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
To: "Lad, Prabhakar" <prabhakar.csengg@gmail.com>
Cc: LMML <linux-media@vger.kernel.org>,
linux-kernel@vger.kernel.org,
Hans Verkuil <hans.verkuil@cisco.com>
Subject: Re: [PATCH v2 11/11] media: usb: uvc: use vb2_ops_wait_prepare/finish helper
Date: Thu, 27 Nov 2014 00:59:12 +0200 [thread overview]
Message-ID: <2698849.pKqLKtTreZ@avalon> (raw)
In-Reply-To: <1417041754-8714-12-git-send-email-prabhakar.csengg@gmail.com>
Hi Prabhakar,
Thank you for the patch.
On Wednesday 26 November 2014 22:42:34 Lad, Prabhakar wrote:
> This patch drops driver specific wait_prepare() and
> wait_finish() callbacks from vb2_ops and instead uses
> the the helpers vb2_ops_wait_prepare/finish() provided
> by the vb2 core, the lock member of the queue needs
> to be initalized to a mutex so that vb2 helpers
> vb2_ops_wait_prepare/finish() can make use of it.
The queue lock field isn't initialized by the uvcvideo driver, so you can't
use vb2_ops_wait_prepare|finish().
> Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
> Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> ---
> drivers/media/usb/uvc/uvc_queue.c | 18 ++----------------
> 1 file changed, 2 insertions(+), 16 deletions(-)
>
> diff --git a/drivers/media/usb/uvc/uvc_queue.c
> b/drivers/media/usb/uvc/uvc_queue.c index cc96072..64147b5 100644
> --- a/drivers/media/usb/uvc/uvc_queue.c
> +++ b/drivers/media/usb/uvc/uvc_queue.c
> @@ -143,20 +143,6 @@ static void uvc_buffer_finish(struct vb2_buffer *vb)
> uvc_video_clock_update(stream, &vb->v4l2_buf, buf);
> }
>
> -static void uvc_wait_prepare(struct vb2_queue *vq)
> -{
> - struct uvc_video_queue *queue = vb2_get_drv_priv(vq);
> -
> - mutex_unlock(&queue->mutex);
> -}
> -
> -static void uvc_wait_finish(struct vb2_queue *vq)
> -{
> - struct uvc_video_queue *queue = vb2_get_drv_priv(vq);
> -
> - mutex_lock(&queue->mutex);
> -}
> -
> static int uvc_start_streaming(struct vb2_queue *vq, unsigned int count)
> {
> struct uvc_video_queue *queue = vb2_get_drv_priv(vq);
> @@ -195,8 +181,8 @@ static struct vb2_ops uvc_queue_qops = {
> .buf_prepare = uvc_buffer_prepare,
> .buf_queue = uvc_buffer_queue,
> .buf_finish = uvc_buffer_finish,
> - .wait_prepare = uvc_wait_prepare,
> - .wait_finish = uvc_wait_finish,
> + .wait_prepare = vb2_ops_wait_prepare,
> + .wait_finish = vb2_ops_wait_finish,
> .start_streaming = uvc_start_streaming,
> .stop_streaming = uvc_stop_streaming,
> };
--
Regards,
Laurent Pinchart
next prev parent reply other threads:[~2014-11-26 22:58 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-26 22:42 [PATCH v2 00/11] media: use vb2_ops_wait_prepare/finish helper Lad, Prabhakar
2014-11-26 22:42 ` [PATCH v2 01/11] media: s3c-camif: " Lad, Prabhakar
2014-12-08 11:04 ` Sylwester Nawrocki
2014-11-26 22:42 ` [PATCH v2 02/11] media: ti-vpe: " Lad, Prabhakar
2014-11-26 22:42 ` [PATCH v2 03/11] media: exynos-gsc: " Lad, Prabhakar
2014-11-26 22:42 ` [PATCH v2 04/11] media: soc_camera: " Lad, Prabhakar
2014-11-26 22:42 ` [PATCH v2 05/11] media: sh_veu: " Lad, Prabhakar
2014-11-26 22:42 ` [PATCH v2 06/11] media: marvell-ccic: " Lad, Prabhakar
2014-12-01 19:52 ` Jonathan Corbet
2014-11-26 22:42 ` [PATCH v2 07/11] media: s5p-tv: " Lad, Prabhakar
2014-11-26 22:42 ` [PATCH v2 08/11] media: blackfin: " Lad, Prabhakar
2014-11-26 22:42 ` [PATCH v2 09/11] media: s5p-mfc: " Lad, Prabhakar
2014-11-26 22:42 ` [PATCH v2 10/11] media: davinci: vpif_capture: " Lad, Prabhakar
2014-11-26 22:42 ` [PATCH v2 11/11] media: usb: uvc: " Lad, Prabhakar
2014-11-26 22:59 ` Laurent Pinchart [this message]
2014-11-26 23:17 ` Prabhakar Lad
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2698849.pKqLKtTreZ@avalon \
--to=laurent.pinchart@ideasonboard.com \
--cc=hans.verkuil@cisco.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=prabhakar.csengg@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).