From patchwork Fri Aug 30 02:17:11 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pawel Osciak X-Patchwork-Id: 2851731 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id DB2D3C0AB5 for ; Fri, 30 Aug 2013 02:18:48 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CDEB3201B5 for ; Fri, 30 Aug 2013 02:18:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BC0012018B for ; Fri, 30 Aug 2013 02:18:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755234Ab3H3CRu (ORCPT ); Thu, 29 Aug 2013 22:17:50 -0400 Received: from mail-pd0-f182.google.com ([209.85.192.182]:39763 "EHLO mail-pd0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755152Ab3H3CRs (ORCPT ); Thu, 29 Aug 2013 22:17:48 -0400 Received: by mail-pd0-f182.google.com with SMTP id r10so1219488pdi.41 for ; Thu, 29 Aug 2013 19:17:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=DaAkqfaEawENFJAX0OGke4QsFz7ro9Jcau1uKkZ9ZxU=; b=KAXpVAOi4/GJRafgC1NVsP0B9pQQvL5RMHbPnihBHMhTZmwks2w+dFeHVLDg7HbFOz XDquCff06kitE8hkjHyrxx9OVwMVVaF4/H0m3fYopOtf2LnasHlh9ZjuyK41xH8fsif4 fu7cM4ppYdhlI7+yFq+sDrEyb2jaMPUB/jZu4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=DaAkqfaEawENFJAX0OGke4QsFz7ro9Jcau1uKkZ9ZxU=; b=jn1gDE0iIwjC50YAdkAGdUHORQDK07zkkono0XneVEeTmFGUBLxU6V6BerqCcomSNV 0Rd+9MVqpFpemJ52lpKUvQSofmCAirNT9OUhdhBe6sO5dTRX/M8rdrrU3IsNk5oQ7Ntj 8NcD2xTJMk33scDe0vla7gfNw8eYnh8gJN3sEWghmC7pHF8gGc+Sx6314L+hhR6kTTWZ 4dTRLf4oB6IZotp5wF+vMiPx0HZNfeHEzwHmwrK6xmbKw1xa0lIqTKbJKduIIGDrraBA TctCLaaX5CW7cdZlGsLi7EdPf0BUFtxlZMPzUGZ+C/NIipHhsCQOjFgPRlOze/8/w0rl aqTw== X-Gm-Message-State: ALoCoQnUKDC9uDpMtojEefItti9gr3bbhoLdHXjiDZgtEXyrYGTTcX4NP9lVCHTV9Jc0fHPzXpet X-Received: by 10.68.129.201 with SMTP id ny9mr6852430pbb.165.1377829068177; Thu, 29 Aug 2013 19:17:48 -0700 (PDT) Received: from kawagoe.tok.corp.google.com (kawagoe.tok.corp.google.com [172.30.88.114]) by mx.google.com with ESMTPSA id ye1sm27935254pab.19.1969.12.31.16.00.00 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 29 Aug 2013 19:17:47 -0700 (PDT) From: Pawel Osciak To: linux-media@vger.kernel.org Cc: laurent.pinchart@ideasonboard.com, Pawel Osciak Subject: [PATCH v1 12/19] uvcvideo: Reorganize next buffer handling. Date: Fri, 30 Aug 2013 11:17:11 +0900 Message-Id: <1377829038-4726-13-git-send-email-posciak@chromium.org> X-Mailer: git-send-email 1.8.4 In-Reply-To: <1377829038-4726-1-git-send-email-posciak@chromium.org> References: <1377829038-4726-1-git-send-email-posciak@chromium.org> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-9.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Move getting the first buffer from the current queue to a uvc_queue function and out of the USB completion handler. Signed-off-by: Pawel Osciak --- drivers/media/usb/uvc/uvc_isight.c | 6 ++++-- drivers/media/usb/uvc/uvc_queue.c | 14 ++++++++++++++ drivers/media/usb/uvc/uvc_video.c | 29 ++++++++++++----------------- drivers/media/usb/uvc/uvcvideo.h | 7 +++---- 4 files changed, 33 insertions(+), 23 deletions(-) diff --git a/drivers/media/usb/uvc/uvc_isight.c b/drivers/media/usb/uvc/uvc_isight.c index 8510e72..ab01286 100644 --- a/drivers/media/usb/uvc/uvc_isight.c +++ b/drivers/media/usb/uvc/uvc_isight.c @@ -99,10 +99,12 @@ static int isight_decode(struct uvc_video_queue *queue, struct uvc_buffer *buf, return 0; } -void uvc_video_decode_isight(struct urb *urb, struct uvc_streaming *stream, - struct uvc_buffer *buf) +void uvc_video_decode_isight(struct urb *urb, struct uvc_streaming *stream) { int ret, i; + struct uvc_buffer *buf; + + buf = uvc_queue_get_first_buf(&stream->queue); for (i = 0; i < urb->number_of_packets; ++i) { if (urb->iso_frame_desc[i].status < 0) { diff --git a/drivers/media/usb/uvc/uvc_queue.c b/drivers/media/usb/uvc/uvc_queue.c index cd962be..55d2670 100644 --- a/drivers/media/usb/uvc/uvc_queue.c +++ b/drivers/media/usb/uvc/uvc_queue.c @@ -352,6 +352,20 @@ void uvc_queue_cancel(struct uvc_video_queue *queue, int disconnect) spin_unlock_irqrestore(&queue->irqlock, flags); } +struct uvc_buffer *uvc_queue_get_first_buf(struct uvc_video_queue *queue) +{ + struct uvc_buffer *buf = NULL; + unsigned long flags; + + spin_lock_irqsave(&queue->irqlock, flags); + if (!list_empty(&queue->irqqueue)) + buf = list_first_entry(&queue->irqqueue, struct uvc_buffer, + queue); + spin_unlock_irqrestore(&queue->irqlock, flags); + + return buf; +} + struct uvc_buffer *uvc_queue_next_buffer(struct uvc_video_queue *queue, struct uvc_buffer *buf) { diff --git a/drivers/media/usb/uvc/uvc_video.c b/drivers/media/usb/uvc/uvc_video.c index b4ebccd..2f9a5fa 100644 --- a/drivers/media/usb/uvc/uvc_video.c +++ b/drivers/media/usb/uvc/uvc_video.c @@ -1193,11 +1193,11 @@ static int uvc_video_encode_data(struct uvc_streaming *stream, /* * Completion handler for video URBs. */ -static void uvc_video_decode_isoc(struct urb *urb, struct uvc_streaming *stream, - struct uvc_buffer *buf) +static void uvc_video_decode_isoc(struct urb *urb, struct uvc_streaming *stream) { u8 *mem; int ret, i; + struct uvc_buffer *buf = NULL; for (i = 0; i < urb->number_of_packets; ++i) { if (urb->iso_frame_desc[i].status < 0) { @@ -1211,6 +1211,7 @@ static void uvc_video_decode_isoc(struct urb *urb, struct uvc_streaming *stream, /* Decode the payload header. */ mem = urb->transfer_buffer + urb->iso_frame_desc[i].offset; + buf = uvc_queue_get_first_buf(&stream->queue); do { ret = uvc_video_decode_start(stream, buf, mem, urb->iso_frame_desc[i].actual_length); @@ -1241,11 +1242,11 @@ static void uvc_video_decode_isoc(struct urb *urb, struct uvc_streaming *stream, } } -static void uvc_video_decode_bulk(struct urb *urb, struct uvc_streaming *stream, - struct uvc_buffer *buf) +static void uvc_video_decode_bulk(struct urb *urb, struct uvc_streaming *stream) { u8 *mem; int len, ret; + struct uvc_buffer *buf; /* * Ignore ZLPs if they're not part of a frame, otherwise process them @@ -1258,6 +1259,8 @@ static void uvc_video_decode_bulk(struct urb *urb, struct uvc_streaming *stream, len = urb->actual_length; stream->bulk.payload_size += len; + buf = uvc_queue_get_first_buf(&stream->queue); + /* If the URB is the first of its payload, decode and save the * header. */ @@ -1309,12 +1312,13 @@ static void uvc_video_decode_bulk(struct urb *urb, struct uvc_streaming *stream, } } -static void uvc_video_encode_bulk(struct urb *urb, struct uvc_streaming *stream, - struct uvc_buffer *buf) +static void uvc_video_encode_bulk(struct urb *urb, struct uvc_streaming *stream) { u8 *mem = urb->transfer_buffer; int len = stream->urb_size, ret; + struct uvc_buffer *buf; + buf = uvc_queue_get_first_buf(&stream->queue); if (buf == NULL) { urb->transfer_buffer_length = 0; return; @@ -1355,9 +1359,6 @@ static void uvc_video_encode_bulk(struct urb *urb, struct uvc_streaming *stream, static void uvc_video_complete(struct urb *urb) { struct uvc_streaming *stream = urb->context; - struct uvc_video_queue *queue = &stream->queue; - struct uvc_buffer *buf = NULL; - unsigned long flags; int ret; switch (urb->status) { @@ -1374,17 +1375,11 @@ static void uvc_video_complete(struct urb *urb) case -ECONNRESET: /* usb_unlink_urb() called. */ case -ESHUTDOWN: /* The endpoint is being disabled. */ - uvc_queue_cancel(queue, urb->status == -ESHUTDOWN); + uvc_queue_cancel(&stream->queue, urb->status == -ESHUTDOWN); return; } - spin_lock_irqsave(&queue->irqlock, flags); - if (!list_empty(&queue->irqqueue)) - buf = list_first_entry(&queue->irqqueue, struct uvc_buffer, - queue); - spin_unlock_irqrestore(&queue->irqlock, flags); - - stream->decode(urb, stream, buf); + stream->decode(urb, stream); if ((ret = usb_submit_urb(urb, GFP_ATOMIC)) < 0) { uvc_printk(KERN_ERR, "Failed to resubmit video URB (%d).\n", diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h index 46ffd92..bca8715 100644 --- a/drivers/media/usb/uvc/uvcvideo.h +++ b/drivers/media/usb/uvc/uvcvideo.h @@ -482,8 +482,7 @@ struct uvc_streaming { /* Buffers queue. */ unsigned int frozen : 1; struct uvc_video_queue queue; - void (*decode) (struct urb *urb, struct uvc_streaming *video, - struct uvc_buffer *buf); + void (*decode) (struct urb *urb, struct uvc_streaming *video); /* Context data used by the bulk completion handler. */ struct { @@ -659,6 +658,7 @@ extern int uvc_dequeue_buffer(struct uvc_video_queue *queue, struct v4l2_buffer *v4l2_buf, int nonblocking); extern int uvc_queue_enable(struct uvc_video_queue *queue, int enable); extern void uvc_queue_cancel(struct uvc_video_queue *queue, int disconnect); +struct uvc_buffer *uvc_queue_get_first_buf(struct uvc_video_queue *queue); extern struct uvc_buffer *uvc_queue_next_buffer(struct uvc_video_queue *queue, struct uvc_buffer *buf); extern int uvc_queue_mmap(struct uvc_video_queue *queue, @@ -751,8 +751,7 @@ extern struct usb_host_endpoint *uvc_find_endpoint( struct usb_host_interface *alts, __u8 epaddr); /* Quirks support */ -void uvc_video_decode_isight(struct urb *urb, struct uvc_streaming *stream, - struct uvc_buffer *buf); +void uvc_video_decode_isight(struct urb *urb, struct uvc_streaming *stream); /* debugfs and statistics */ int uvc_debugfs_init(void);