From patchwork Mon Mar 13 19:20:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Gustavo F. Padovan" X-Patchwork-Id: 40017 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cnVY6-0004Ml-Ck; Mon, 13 Mar 2017 19:22:30 +0000 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.84_2/mailfrontend-8) with esmtp id 1cnVY4-0002dB-k2; Mon, 13 Mar 2017 20:22:30 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754178AbdCMTW1 (ORCPT + 1 other); Mon, 13 Mar 2017 15:22:27 -0400 Received: from mail-qt0-f196.google.com ([209.85.216.196]:34489 "EHLO mail-qt0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753498AbdCMTVJ (ORCPT ); Mon, 13 Mar 2017 15:21:09 -0400 Received: by mail-qt0-f196.google.com with SMTP id x35so7472753qtc.1; Mon, 13 Mar 2017 12:21:08 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Jzt5hM5ro8PwB3waFpXqnAaWZZJMGauV0ROeuwkcDm4=; b=mRHDmzcJMxhuKntB63qyLzWpIooznfdy448KkVMdCa0+lzBKra2zyw22U8xKZsAsUq 2iCLGhg2mQOX/7b9oMkxqP9gXqFEmJ6Y2xZBbLJvw2ewTvLW11O7RCafczSD6h5QJP59 XOtJKKhMtxKT+cAbOlvcfXUI7TW9+hLm6sxG2w65ZR3hEVFTGOt4a7UTH32NBCPO8UiL 5kYxpAQVV0L9JCewC67UR67GBoZdEzqtHhZsEyNzrCDV+vWulPBJdYQ+rpNATdAk23Kz M5zs2t3l6jIQrVPouwgBa8jiebJbuu9KDePa7Pe6Q91wzJp4dTBzgI4OzLXeA56IgES2 g8lw== X-Gm-Message-State: AMke39lz2L6SNuzpht4SCHQvTh+BuwaWQE3j7vTpgz5/CkQww40GT0s8lt0cJmMQBOfz2Q== X-Received: by 10.200.0.25 with SMTP id a25mr32056413qtg.199.1489432867423; Mon, 13 Mar 2017 12:21:07 -0700 (PDT) Received: from localhost.localdomain ([179.159.9.225]) by smtp.gmail.com with ESMTPSA id a19sm12821047qta.48.2017.03.13.12.21.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 13 Mar 2017 12:21:07 -0700 (PDT) From: Gustavo Padovan To: linux-media@vger.kernel.org Cc: Hans Verkuil , Mauro Carvalho Chehab , Laurent Pinchart , Javier Martinez Canillas , linux-kernel@vger.kernel.org, Gustavo Padovan Subject: [RFC 09/10] [media] vb2: add infrastructure to support out-fences Date: Mon, 13 Mar 2017 16:20:34 -0300 Message-Id: <20170313192035.29859-10-gustavo@padovan.org> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170313192035.29859-1-gustavo@padovan.org> References: <20170313192035.29859-1-gustavo@padovan.org> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 6.0.0.2142326, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2017.3.13.191516 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_2000_2999 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, IN_REP_TO 0, LEGITIMATE_SIGNS 0, MSG_THREAD 0, MULTIPLE_REAL_RCPTS 0, NO_URI_HTTPS 0, REFERENCES 0, __ANY_URI 0, __CC_NAME 0, __CC_NAME_DIFF_FROM_ACC 0, __CC_REAL_NAMES 0, __HAS_CC_HDR 0, __HAS_FROM 0, __HAS_LIST_ID 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __IN_REP_TO 0, __MIME_TEXT_ONLY 0, __MIME_TEXT_P 0, __MIME_TEXT_P1 0, __MULTIPLE_RCPTS_CC_X2 0, __NO_HTML_TAG_RAW 0, __REFERENCES 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS , __YOUTUBE_RCVD 0' From: Gustavo Padovan Add vb2_setup_out_fence() and the needed members to struct vb2_buffer. Signed-off-by: Gustavo Padovan --- drivers/media/v4l2-core/videobuf2-core.c | 31 +++++++++++++++++++++++++++++++ include/media/videobuf2-core.h | 5 +++++ 2 files changed, 36 insertions(+) diff --git a/drivers/media/v4l2-core/videobuf2-core.c b/drivers/media/v4l2-core/videobuf2-core.c index d9cb777..54b1404 100644 --- a/drivers/media/v4l2-core/videobuf2-core.c +++ b/drivers/media/v4l2-core/videobuf2-core.c @@ -23,8 +23,11 @@ #include #include #include +#include +#include #include +#include #include #include @@ -1315,6 +1318,34 @@ int vb2_core_prepare_buf(struct vb2_queue *q, unsigned int index, void *pb) } EXPORT_SYMBOL_GPL(vb2_core_prepare_buf); +int vb2_setup_out_fence(struct vb2_queue *q, unsigned int index) +{ + struct vb2_buffer *vb = q->bufs[index]; + + vb->out_fence_fd = get_unused_fd_flags(O_CLOEXEC); + if (vb->out_fence_fd < 0) + return vb->out_fence_fd; + + vb->out_fence = vb2_fence_alloc(); + if (!vb->out_fence) + goto err; + + vb->sync_file = sync_file_create(vb->out_fence); + if (!vb->sync_file) { + dma_fence_put(vb->out_fence); + vb->out_fence = NULL; + goto err; + } + + return 0; + +err: + put_unused_fd(vb->out_fence_fd); + vb->out_fence_fd = -1; + return -ENOMEM; +} +EXPORT_SYMBOL_GPL(vb2_setup_out_fence); + /** * vb2_start_streaming() - Attempt to start streaming. * @q: videobuf2 queue diff --git a/include/media/videobuf2-core.h b/include/media/videobuf2-core.h index fe2de99..efdc390 100644 --- a/include/media/videobuf2-core.h +++ b/include/media/videobuf2-core.h @@ -263,6 +263,10 @@ struct vb2_buffer { struct dma_fence *in_fence; struct dma_fence_cb fence_cb; + + struct dma_fence *out_fence; + struct sync_file *sync_file; + int out_fence_fd; #ifdef CONFIG_VIDEO_ADV_DEBUG /* * Counters for how often these buffer-related ops are @@ -710,6 +714,7 @@ int vb2_core_create_bufs(struct vb2_queue *q, enum vb2_memory memory, */ int vb2_core_prepare_buf(struct vb2_queue *q, unsigned int index, void *pb); +int vb2_setup_out_fence(struct vb2_queue *q, unsigned int index); /** * vb2_core_qbuf() - Queue a buffer from userspace *