From patchwork Thu Sep 7 18:42:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Padovan X-Patchwork-Id: 9942695 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8897A602CC for ; Thu, 7 Sep 2017 18:44:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 842C3287FA for ; Thu, 7 Sep 2017 18:44:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 79179287FE; Thu, 7 Sep 2017 18:44:14 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.4 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E5A90287FA for ; Thu, 7 Sep 2017 18:44:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932093AbdIGSn0 (ORCPT ); Thu, 7 Sep 2017 14:43:26 -0400 Received: from mail-qt0-f195.google.com ([209.85.216.195]:35406 "EHLO mail-qt0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756029AbdIGSnX (ORCPT ); Thu, 7 Sep 2017 14:43:23 -0400 Received: by mail-qt0-f195.google.com with SMTP id p55so329014qtc.2; Thu, 07 Sep 2017 11:43:22 -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=lNzIJKqLw1Eb1zCt41a2oAcEd5aeQxlsAa29KXVCfPY=; b=Yma+i70u2OLMyEp87pn6lqJU1Ay5J+zXnQkdKqLOXM3IIJUmUvxEjC7obNX9ouLHRR AvwE+mcPVfD1jftI4QnZzAn0BWH7sUoPLqmzDIgb8VvfRX/ZbkOY1OQ1AHv2XlS6wU1J xLvnCBuWHREtT2kqrB8bcKzw4AHmCWDIxMh29yRrkJltNYIdPQvviLagmSMd7OPivxfL c1K00NvVnymYqSvtmyV/oz7ZMZGBvCKORZbbBe9OjebbFUYKpSJqYBbnUHMuR+GvUX9d 8DSZKX98tlk+X22kBkLC2FnOMNmd+L7C4/PuihYlHAw58SD8/ygrf/kO0JFzE+HmfIgq rtow== X-Gm-Message-State: AHPjjUhlU0YOXtADuhb+TSaT9RDIkfAle9spAbaHKXM88BAkW+BlwqzL C9gOeJgwpK8/1rwAVRs= X-Google-Smtp-Source: AOwi7QC96eRv+PMEnUWgS9WSFn4a/syv66KTgkDOOuhZ2r3t3iAcS4bozhi4Z21dBoDJ/ASsil8WPw== X-Received: by 10.200.20.132 with SMTP id l4mr510585qtj.10.1504809802318; Thu, 07 Sep 2017 11:43:22 -0700 (PDT) Received: from localhost.localdomain ([187.10.21.246]) by smtp.gmail.com with ESMTPSA id v30sm213216qtg.70.2017.09.07.11.43.19 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 07 Sep 2017 11:43:21 -0700 (PDT) From: Gustavo Padovan To: linux-media@vger.kernel.org Cc: Hans Verkuil , Mauro Carvalho Chehab , Shuah Khan , linux-kernel@vger.kernel.org, Gustavo Padovan Subject: [PATCH v3 13/15] [media] vb2: add infrastructure to support out-fences Date: Thu, 7 Sep 2017 15:42:24 -0300 Message-Id: <20170907184226.27482-14-gustavo@padovan.org> X-Mailer: git-send-email 2.13.5 In-Reply-To: <20170907184226.27482-1-gustavo@padovan.org> References: <20170907184226.27482-1-gustavo@padovan.org> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 | 55 ++++++++++++++++++++++++++++++++ include/media/videobuf2-core.h | 34 ++++++++++++++++++++ 2 files changed, 89 insertions(+) diff --git a/drivers/media/v4l2-core/videobuf2-core.c b/drivers/media/v4l2-core/videobuf2-core.c index bbbae0eed567..34adf1916194 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 @@ -1317,6 +1320,58 @@ 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) +{ + struct vb2_fence *fence; + + fence = kzalloc(sizeof(*fence), GFP_KERNEL); + if (!fence) + return -ENOMEM; + + fence->out_fence_fd = get_unused_fd_flags(O_CLOEXEC); + if (fence->out_fence_fd < 0) { + kfree(fence); + return fence->out_fence_fd; + } + + fence->out_fence = vb2_fence_alloc(); + if (!fence->out_fence) + goto err_fence; + + fence->sync_file = sync_file_create(fence->out_fence); + if (!fence->sync_file) { + dma_fence_put(fence->out_fence); + goto err_fence; + } + + spin_lock(&q->out_fence_lock); + list_add_tail(&fence->entry, &q->out_fence_list); + spin_unlock(&q->out_fence_lock); + + return 0; + +err_fence: + kfree(fence); + put_unused_fd(fence->out_fence_fd); + return -ENOMEM; +} +EXPORT_SYMBOL_GPL(vb2_setup_out_fence); + +void vb2_cleanup_out_fence(struct vb2_queue *q) +{ + struct vb2_fence *fence; + + spin_lock(&q->out_fence_lock); + fence = list_last_entry(&q->out_fence_list, + struct vb2_fence, entry); + put_unused_fd(fence->out_fence_fd); + fput(fence->sync_file->file); + list_del(&fence->entry); + spin_unlock(&q->out_fence_lock); + kfree(fence); +} +EXPORT_SYMBOL_GPL(vb2_cleanup_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 20099dc22f26..84e5e7216a1e 100644 --- a/include/media/videobuf2-core.h +++ b/include/media/videobuf2-core.h @@ -427,6 +427,24 @@ struct vb2_buf_ops { void (*buffer_queued)(struct vb2_buffer *vb); }; +/* + * struct vb2_fence - storage for fence data before queueing to the driver. + * + * @out_fence_fd: the fd where to install the sync_file + * @out_fence: the fence associated to the sync_file + * @sync_file: the sync_file to be shared with userspace via the + * out_fence_fd + * @files: stores files struct for cleanup purposes + * @entry: the list head element for the out_fence_list + */ +struct vb2_fence { + int out_fence_fd; + struct dma_fence *out_fence; + struct sync_file *sync_file; + struct files_struct *files; + struct list_head entry; +}; + /** * struct vb2_queue - a videobuf queue * @@ -734,6 +752,22 @@ 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); /** + * vb2_setup_out_fence() - setup new out-fence + * @q: The vb2_queue where to setup it + * + * Setup the file descriptor, the fence and the sync_file for the next + * buffer to be queued and add everything to the tail of the q->out_fence_list. + */ +int vb2_setup_out_fence(struct vb2_queue *q); + +/** + * vb2_cleanup_out_fence() - cleanup out-fence + * @q: The vb2_queue to use for cleanup + * + * Clean up the last fence on the list. Used only when QBUF fails. + */ +void vb2_cleanup_out_fence(struct vb2_queue *q); +/** * vb2_core_qbuf() - Queue a buffer from userspace * * @q: videobuf2 queue