From patchwork Mon Jan 2 14:12:23 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Javier Martin X-Patchwork-Id: 9295 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1Rhicx-0000AP-T0; Mon, 02 Jan 2012 15:13:01 +0100 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.75/mailfrontend-3) with esmtp id 1Rhicx-0003j1-Dv; Mon, 02 Jan 2012 15:12:39 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752575Ab2ABOMh (ORCPT + 4 others); Mon, 2 Jan 2012 09:12:37 -0500 Received: from mail-wi0-f174.google.com ([209.85.212.174]:45206 "EHLO mail-wi0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752549Ab2ABOMg (ORCPT ); Mon, 2 Jan 2012 09:12:36 -0500 Received: by wibhm6 with SMTP id hm6so8408700wib.19 for ; Mon, 02 Jan 2012 06:12:35 -0800 (PST) Received: by 10.180.80.164 with SMTP id s4mr34493375wix.7.1325513555387; Mon, 02 Jan 2012 06:12:35 -0800 (PST) Received: from localhost.localdomain (220.51.18.95.dynamic.jazztel.es. [95.18.51.220]) by mx.google.com with ESMTPS id m13sm50774662wbh.0.2012.01.02.06.12.33 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 02 Jan 2012 06:12:34 -0800 (PST) From: Javier Martin To: linux-media@vger.kernel.org Cc: mchehab@infradead.org, pawel@osciak.com, laurent.pinchart@ideasonboard.com, m.szyprowski@samsung.com, kyungmin.park@samsung.com, Javier Martin Subject: [PATCH 2/2] uvcvideo: Allow userptr IO mode. Date: Mon, 2 Jan 2012 15:12:23 +0100 Message-Id: <1325513543-17299-2-git-send-email-javier.martin@vista-silicon.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1325513543-17299-1-git-send-email-javier.martin@vista-silicon.com> References: <1325513543-17299-1-git-send-email-javier.martin@vista-silicon.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 5.6.1.2065439, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2012.1.2.140314 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' MULTIPLE_RCPTS 0.1, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1100_1199 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, __ANY_URI 0, __CP_MEDIA_BODY 0, __CP_URI_IN_BODY 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __MULTIPLE_RCPTS_CC_X2 0, __SANE_MSGID 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS ' X-LSpam-Score: -1.9 (-) X-LSpam-Report: No, score=-1.9 required=5.0 tests=BAYES_00=-1.9 autolearn=ham Userptr can be very useful if a UVC camera is requested to use video buffers allocated by another processing device. So that buffers don't need to be copied. Signed-off-by: Javier Martin Acked-by: Laurent Pinchart --- drivers/media/video/uvc/uvc_queue.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/media/video/uvc/uvc_queue.c b/drivers/media/video/uvc/uvc_queue.c index 518f77d..8f54e24 100644 --- a/drivers/media/video/uvc/uvc_queue.c +++ b/drivers/media/video/uvc/uvc_queue.c @@ -126,7 +126,7 @@ void uvc_queue_init(struct uvc_video_queue *queue, enum v4l2_buf_type type, int drop_corrupted) { queue->queue.type = type; - queue->queue.io_modes = VB2_MMAP; + queue->queue.io_modes = VB2_MMAP | VB2_USERPTR; queue->queue.drv_priv = queue; queue->queue.buf_struct_size = sizeof(struct uvc_buffer); queue->queue.ops = &uvc_queue_qops;