Received: by 10.223.164.202 with SMTP id h10csp1088190wrb; Fri, 17 Nov 2017 13:44:54 -0800 (PST) X-Google-Smtp-Source: AGs4zMa0Ic9L+KCWw0+dBBYgMiyTEWplzwhFs+kHU4YdPtLsRBUUDr9pLpRStBA1h5wwDPwcCkYo X-Received: by 10.99.52.65 with SMTP id b62mr6355162pga.383.1510955094098; Fri, 17 Nov 2017 13:44:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510955094; cv=none; d=google.com; s=arc-20160816; b=MOtS7lthP8FSrW3yvhlDr1G+5VR07NwoKkcKCCnuVpXPA1UyGFnpwh6nrww5opDln/ 10grNsPVodUxsrMZC8GAxmfUtUQO8nD8K+59So/pPJu9LxtotDs2DkAwcQhlhEA2L+Bm DNEk+IjQGG/Ano9pat07VDkhVzCmg1AYbU2AlwX0S7e+jWhyZNRQB8hgpaAB+yuF6A5t p94RtZX9lhX6msIbPtCgjdxZN6mrzKZx3N5RTzG0FpQ+uSodqb6OyFmVKNgXA9gSU1mp JBmkW3U3KDUOu7xrrq/z4at/alMv1700u32Jf9mf8/7ozea1tNp8IcwmFW5PZ6RNKSdR Exbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :organization:references:in-reply-to:message-id:subject:cc:to:from :date:arc-authentication-results; bh=9/AsK6oo7WHJ3+USD1lcLFmHlWZhNKOy0zTGq+wpuZ8=; b=wTH7vXAm/Lf8PpNWEzlRfwnlRg9+Nqj3ECt3T/cDSb05El5p+nOKe3D2EwrKn/qJw2 q+n155Sd8nR9YBBQ4T8JsBY/cC1QSYdyq2zaZdOBB5WEnSQ5h8lexT8F8bCYve8w9uY0 wK0kfTM+3kNoT0ObbxXJXkd7dJCp1Gf7MFAIbehsq84UBM9NYMqNB4sY0lFL6zSLj84q 6Ce49rOqdd7xy3zK4B59MmzFfD5ObYI+7NB/nU//o2exSr9Vc6ss1UUAO09rY3tG1pS9 qaKyzxuwUAWglhhrT7/1sL8KQeyXL6Ni6YOSmnv2h/+0sQg89QYZ9qqzOvMs+hwtfZTR qRVg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=samsung.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t3si3653025plr.284.2017.11.17.13.44.40; Fri, 17 Nov 2017 13:44:54 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=samsung.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932948AbdKQMyH (ORCPT + 93 others); Fri, 17 Nov 2017 07:54:07 -0500 Received: from osg.samsung.com ([64.30.133.232]:59191 "EHLO osg.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751175AbdKQMyA (ORCPT ); Fri, 17 Nov 2017 07:54:00 -0500 Received: from localhost (localhost [127.0.0.1]) by osg.samsung.com (Postfix) with ESMTP id 95C742B3A9; Fri, 17 Nov 2017 04:53:59 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at dev.s-opensource.com Received: from osg.samsung.com ([127.0.0.1]) by localhost (localhost [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id edUriGnzW08P; Fri, 17 Nov 2017 04:53:57 -0800 (PST) Received: from vento.lan (177.17.214.168.dynamic.adsl.gvt.net.br [177.17.214.168]) by osg.samsung.com (Postfix) with ESMTPSA id D62472B3A1; Fri, 17 Nov 2017 04:53:54 -0800 (PST) Date: Fri, 17 Nov 2017 10:53:51 -0200 From: Mauro Carvalho Chehab To: Gustavo Padovan Cc: linux-media@vger.kernel.org, Hans Verkuil , Shuah Khan , Pawel Osciak , Alexandre Courbot , Sakari Ailus , Brian Starkey , Thierry Escande , linux-kernel@vger.kernel.org, Gustavo Padovan Subject: Re: [RFC v5 07/11] [media] vb2: add in-fence support to QBUF Message-ID: <20171117105351.3bb0af32@vento.lan> In-Reply-To: <20171115171057.17340-8-gustavo@padovan.org> References: <20171115171057.17340-1-gustavo@padovan.org> <20171115171057.17340-8-gustavo@padovan.org> Organization: Samsung X-Mailer: Claws Mail 3.15.1-dirty (GTK+ 2.24.31; x86_64-redhat-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Em Wed, 15 Nov 2017 15:10:53 -0200 Gustavo Padovan escreveu: > From: Gustavo Padovan > > Receive in-fence from userspace and add support for waiting on them > before queueing the buffer to the driver. Buffers can't be queued to the > driver before its fences signal. And a buffer can't be queue to the driver > out of the order they were queued from userspace. That means that even if > it fence signal it must wait all other buffers, ahead of it in the queue, > to signal first. > > To make that possible we use fence_array to keep that ordering. Basically > we create a fence_array that contains both the current fence and the fence > from the previous buffer (which might be a fence array as well). The base > fence class for the fence_array becomes the new buffer fence, waiting on > that one guarantees that it won't be queued out of order. > > v6: > - With fences always keep the order userspace queues the buffers. > - Protect in_fence manipulation with a lock (Brian Starkey) > - check if fences have the same context before adding a fence array > - Fix last_fence ref unbalance in __set_in_fence() (Brian Starkey) > - Clean up fence if __set_in_fence() fails (Brian Starkey) > - treat -EINVAL from dma_fence_add_callback() (Brian Starkey) > > v5: - use fence_array to keep buffers ordered in vb2 core when > needed (Brian Starkey) > - keep backward compat on the reserved2 field (Brian Starkey) > - protect fence callback removal with lock (Brian Starkey) > > v4: > - Add a comment about dma_fence_add_callback() not returning a > error (Hans) > - Call dma_fence_put(vb->in_fence) if fence signaled (Hans) > - select SYNC_FILE under config VIDEOBUF2_CORE (Hans) > - Move dma_fence_is_signaled() check to __enqueue_in_driver() (Hans) > - Remove list_for_each_entry() in __vb2_core_qbuf() (Hans) > - Remove if (vb->state != VB2_BUF_STATE_QUEUED) from > vb2_start_streaming() (Hans) > - set IN_FENCE flags on __fill_v4l2_buffer (Hans) > - Queue buffers to the driver as soon as they are ready (Hans) > - call fill_user_buffer() after queuing the buffer (Hans) > - add err: label to clean up fence > - add dma_fence_wait() before calling vb2_start_streaming() > > v3: - document fence parameter > - remove ternary if at vb2_qbuf() return (Mauro) > - do not change if conditions behaviour (Mauro) > > v2: > - fix vb2_queue_or_prepare_buf() ret check > - remove check for VB2_MEMORY_DMABUF only (Javier) > - check num of ready buffers to start streaming > - when queueing, start from the first ready buffer > - handle queue cancel > > Signed-off-by: Gustavo Padovan > --- > drivers/media/v4l2-core/Kconfig | 1 + > drivers/media/v4l2-core/videobuf2-core.c | 202 ++++++++++++++++++++++++++++--- > drivers/media/v4l2-core/videobuf2-v4l2.c | 29 ++++- > include/media/videobuf2-core.h | 17 ++- > 4 files changed, 231 insertions(+), 18 deletions(-) > > diff --git a/drivers/media/v4l2-core/Kconfig b/drivers/media/v4l2-core/Kconfig > index a35c33686abf..3f988c407c80 100644 > --- a/drivers/media/v4l2-core/Kconfig > +++ b/drivers/media/v4l2-core/Kconfig > @@ -83,6 +83,7 @@ config VIDEOBUF_DVB > # Used by drivers that need Videobuf2 modules > config VIDEOBUF2_CORE > select DMA_SHARED_BUFFER > + select SYNC_FILE > tristate > > config VIDEOBUF2_MEMOPS > diff --git a/drivers/media/v4l2-core/videobuf2-core.c b/drivers/media/v4l2-core/videobuf2-core.c > index 60f8b582396a..26de4c80717d 100644 > --- a/drivers/media/v4l2-core/videobuf2-core.c > +++ b/drivers/media/v4l2-core/videobuf2-core.c > @@ -23,6 +23,7 @@ > #include > #include > #include > +#include > > #include > #include > @@ -346,6 +347,7 @@ static int __vb2_queue_alloc(struct vb2_queue *q, enum vb2_memory memory, > vb->index = q->num_buffers + buffer; > vb->type = q->type; > vb->memory = memory; > + spin_lock_init(&vb->fence_cb_lock); > for (plane = 0; plane < num_planes; ++plane) { > vb->planes[plane].length = plane_sizes[plane]; > vb->planes[plane].min_length = plane_sizes[plane]; > @@ -1222,6 +1224,9 @@ static void __enqueue_in_driver(struct vb2_buffer *vb) > { > struct vb2_queue *q = vb->vb2_queue; > > + if (vb->in_fence && !dma_fence_is_signaled(vb->in_fence)) > + return; > + > vb->state = VB2_BUF_STATE_ACTIVE; > atomic_inc(&q->owned_by_drv_count); > > @@ -1273,6 +1278,23 @@ static int __buf_prepare(struct vb2_buffer *vb, const void *pb) > return 0; > } > > +static int __get_num_ready_buffers(struct vb2_queue *q) > +{ > + struct vb2_buffer *vb; > + int ready_count = 0; > + unsigned long flags; > + > + /* count num of buffers ready in front of the queued_list */ > + list_for_each_entry(vb, &q->queued_list, queued_entry) { > + spin_lock_irqsave(&vb->fence_cb_lock, flags); > + if (!vb->in_fence || dma_fence_is_signaled(vb->in_fence)) > + ready_count++; > + spin_unlock_irqrestore(&vb->fence_cb_lock, flags); > + } > + > + return ready_count; > +} > + > int vb2_core_prepare_buf(struct vb2_queue *q, unsigned int index, void *pb) > { > struct vb2_buffer *vb; > @@ -1361,9 +1383,87 @@ static int vb2_start_streaming(struct vb2_queue *q) > return ret; > } > > -int vb2_core_qbuf(struct vb2_queue *q, unsigned int index, void *pb) > +static struct dma_fence *__set_in_fence(struct vb2_queue *q, > + struct vb2_buffer *vb, > + struct dma_fence *fence) > +{ > + if (q->last_fence && dma_fence_is_signaled(q->last_fence)) { > + dma_fence_put(q->last_fence); > + q->last_fence = NULL; > + } > + > + /* > + * We always guarantee the ordering of buffers queued from > + * userspace to be the same it is queued to the driver. For that > + * we create a fence array with the fence from the last queued > + * buffer and this one, that way the fence for this buffer can't > + * signal before the last one. > + */ > + if (fence && q->last_fence) { > + struct dma_fence **fences; > + struct dma_fence_array *arr; > + > + if (fence->context == q->last_fence->context) { > + if (fence->seqno - q->last_fence->seqno <= INT_MAX) { > + dma_fence_put(q->last_fence); > + q->last_fence = dma_fence_get(fence); > + } else { > + dma_fence_put(fence); > + fence = dma_fence_get(q->last_fence); > + } > + return fence; > + } > + > + fences = kcalloc(2, sizeof(*fences), GFP_KERNEL); > + if (!fences) > + return ERR_PTR(-ENOMEM); > + > + fences[0] = fence; > + fences[1] = q->last_fence; > + > + arr = dma_fence_array_create(2, fences, > + dma_fence_context_alloc(1), > + 1, false); > + if (!arr) { > + kfree(fences); > + return ERR_PTR(-ENOMEM); > + } > + > + fence = &arr->base; > + > + q->last_fence = dma_fence_get(fence); > + } else if (!fence && q->last_fence) { > + fence = dma_fence_get(q->last_fence); > + } > + > + return fence; > +} > + > +static void vb2_qbuf_fence_cb(struct dma_fence *f, struct dma_fence_cb *cb) > +{ > + struct vb2_buffer *vb = container_of(cb, struct vb2_buffer, fence_cb); > + struct vb2_queue *q = vb->vb2_queue; > + unsigned long flags; > + > + spin_lock_irqsave(&vb->fence_cb_lock, flags); > + if (!vb->in_fence) { > + spin_unlock_irqrestore(&vb->fence_cb_lock, flags); > + return; > + } > + > + dma_fence_put(vb->in_fence); > + vb->in_fence = NULL; > + > + if (q->start_streaming_called) > + __enqueue_in_driver(vb); > + spin_unlock_irqrestore(&vb->fence_cb_lock, flags); > +} > + > +int vb2_core_qbuf(struct vb2_queue *q, unsigned int index, void *pb, > + struct dma_fence *fence) > { > struct vb2_buffer *vb; > + unsigned long flags; > int ret; > > vb = q->bufs[index]; > @@ -1372,16 +1472,18 @@ int vb2_core_qbuf(struct vb2_queue *q, unsigned int index, void *pb) > case VB2_BUF_STATE_DEQUEUED: > ret = __buf_prepare(vb, pb); > if (ret) > - return ret; > + goto err; > break; > case VB2_BUF_STATE_PREPARED: > break; > case VB2_BUF_STATE_PREPARING: > dprintk(1, "buffer still being prepared\n"); > - return -EINVAL; > + ret = -EINVAL; > + goto err; > default: > dprintk(1, "invalid buffer state %d\n", vb->state); > - return -EINVAL; > + ret = -EINVAL; > + goto err; > } > > /* > @@ -1398,30 +1500,83 @@ int vb2_core_qbuf(struct vb2_queue *q, unsigned int index, void *pb) > > trace_vb2_qbuf(q, vb); > > + vb->in_fence = __set_in_fence(q, vb, fence); > + if (IS_ERR(vb->in_fence)) { > + dma_fence_put(fence); > + ret = PTR_ERR(vb->in_fence); > + goto err; > + } > + fence = NULL; > + > + /* > + * If it is time to call vb2_start_streaming() wait for the fence > + * to signal first. Of course, this happens only once per streaming. > + * We want to run any step that might fail before we set the callback > + * to queue the fence when it signals. > + */ > + if (vb->in_fence && !q->start_streaming_called && > + __get_num_ready_buffers(q) == q->min_buffers_needed - 1) > + dma_fence_wait(vb->in_fence, true); > + The above code sounds weird: it is called even if the user is not using fences. You should probably be doing something like: if (fence || q->last_fence) { vb->in_fence = __set_in_fence(q, vb, fence); ... } > /* > * If streamon has been called, and we haven't yet called > * start_streaming() since not enough buffers were queued, and > * we now have reached the minimum number of queued buffers, > * then we can finally call start_streaming(). > - * > - * If already streaming, give the buffer to driver for processing. > - * If not, the buffer will be given to driver on next streamon. > */ > if (q->streaming && !q->start_streaming_called && > - q->queued_count >= q->min_buffers_needed) { > + __get_num_ready_buffers(q) >= q->min_buffers_needed) { I guess the case where fences is not used is not covered here. You probably should add a check at __get_num_ready_buffers(q) as well, making it just return q->queued_count if fences isn't used. > ret = vb2_start_streaming(q); > if (ret) > - return ret; > - } else if (q->start_streaming_called) { > - __enqueue_in_driver(vb); > + goto err; > } > > + /* > + * For explicit synchronization: If the fence didn't signal > + * yet we setup a callback to queue the buffer once the fence > + * signals, and then, return successfully. But if the fence > + * already signaled we lose the reference we held and queue the > + * buffer to the driver. > + */ > + spin_lock_irqsave(&vb->fence_cb_lock, flags); > + if (vb->in_fence) { > + ret = dma_fence_add_callback(vb->in_fence, &vb->fence_cb, > + vb2_qbuf_fence_cb); > + if (ret == -EINVAL) { > + spin_unlock_irqrestore(&vb->fence_cb_lock, flags); > + goto err; > + } else if (!ret) { > + goto fill; > + } > + > + dma_fence_put(vb->in_fence); > + vb->in_fence = NULL; > + } > + > +fill: > + /* > + * If already streaming and there is no fence to wait on > + * give the buffer to driver for processing. > + */ > + if (q->start_streaming_called && !vb->in_fence) > + __enqueue_in_driver(vb); > + spin_unlock_irqrestore(&vb->fence_cb_lock, flags); > + > /* Fill buffer information for the userspace */ > if (pb) > call_void_bufop(q, fill_user_buffer, vb, pb); > > dprintk(2, "qbuf of buffer %d succeeded\n", vb->index); > return 0; > + > +err: > + if (vb->in_fence) { > + dma_fence_put(vb->in_fence); > + vb->in_fence = NULL; > + } > + > + return ret; > + > } > EXPORT_SYMBOL_GPL(vb2_core_qbuf); > > @@ -1632,6 +1787,8 @@ EXPORT_SYMBOL_GPL(vb2_core_dqbuf); > static void __vb2_queue_cancel(struct vb2_queue *q) > { > unsigned int i; > + struct vb2_buffer *vb; > + unsigned long flags; > > /* > * Tell driver to stop all transactions and release all queued > @@ -1659,6 +1816,21 @@ static void __vb2_queue_cancel(struct vb2_queue *q) > q->queued_count = 0; > q->error = 0; > > + list_for_each_entry(vb, &q->queued_list, queued_entry) { > + spin_lock_irqsave(&vb->fence_cb_lock, flags); > + if (vb->in_fence) { > + dma_fence_remove_callback(vb->in_fence, &vb->fence_cb); > + dma_fence_put(vb->in_fence); > + vb->in_fence = NULL; > + } > + spin_unlock_irqrestore(&vb->fence_cb_lock, flags); > + } > + > + if (q->last_fence) { > + dma_fence_put(q->last_fence); > + q->last_fence = NULL; > + } > + > /* > * Remove all buffers from videobuf's list... > */ > @@ -1720,7 +1892,7 @@ int vb2_core_streamon(struct vb2_queue *q, unsigned int type) > * Tell driver to start streaming provided sufficient buffers > * are available. > */ > - if (q->queued_count >= q->min_buffers_needed) { > + if (__get_num_ready_buffers(q) >= q->min_buffers_needed) { > ret = v4l_vb2q_enable_media_source(q); > if (ret) > return ret; > @@ -2240,7 +2412,7 @@ static int __vb2_init_fileio(struct vb2_queue *q, int read) > * Queue all buffers. > */ > for (i = 0; i < q->num_buffers; i++) { > - ret = vb2_core_qbuf(q, i, NULL); > + ret = vb2_core_qbuf(q, i, NULL, NULL); > if (ret) > goto err_reqbufs; > fileio->bufs[i].queued = 1; > @@ -2419,7 +2591,7 @@ static size_t __vb2_perform_fileio(struct vb2_queue *q, char __user *data, size_ > > if (copy_timestamp) > b->timestamp = ktime_get_ns(); > - ret = vb2_core_qbuf(q, index, NULL); > + ret = vb2_core_qbuf(q, index, NULL, NULL); > dprintk(5, "vb2_dbuf result: %d\n", ret); > if (ret) > return ret; > @@ -2522,7 +2694,7 @@ static int vb2_thread(void *data) > if (copy_timestamp) > vb->timestamp = ktime_get_ns();; > if (!threadio->stop) > - ret = vb2_core_qbuf(q, vb->index, NULL); > + ret = vb2_core_qbuf(q, vb->index, NULL, NULL); > call_void_qop(q, wait_prepare, q); > if (ret || threadio->stop) > break; > diff --git a/drivers/media/v4l2-core/videobuf2-v4l2.c b/drivers/media/v4l2-core/videobuf2-v4l2.c > index 110fb45fef6f..4c09ea007d90 100644 > --- a/drivers/media/v4l2-core/videobuf2-v4l2.c > +++ b/drivers/media/v4l2-core/videobuf2-v4l2.c > @@ -23,6 +23,7 @@ > #include > #include > #include > +#include > > #include > #include > @@ -178,6 +179,12 @@ static int vb2_queue_or_prepare_buf(struct vb2_queue *q, struct v4l2_buffer *b, > return -EINVAL; > } > > + if ((b->fence_fd != 0 && b->fence_fd != -1) && > + !(b->flags & V4L2_BUF_FLAG_IN_FENCE)) { > + dprintk(1, "%s: fence_fd set without IN_FENCE flag\n", opname); > + return -EINVAL; > + } > + > return __verify_planes_array(q->bufs[b->index], b); > } > > @@ -203,9 +210,14 @@ static void __fill_v4l2_buffer(struct vb2_buffer *vb, void *pb) > b->timestamp = ns_to_timeval(vb->timestamp); > b->timecode = vbuf->timecode; > b->sequence = vbuf->sequence; > - b->fence_fd = -1; > b->reserved = 0; > > + b->fence_fd = -1; > + if (vb->in_fence) > + b->flags |= V4L2_BUF_FLAG_IN_FENCE; > + else > + b->flags &= ~V4L2_BUF_FLAG_IN_FENCE; > + > if (q->is_multiplanar) { > /* > * Fill in plane-related data if userspace provided an array > @@ -560,6 +572,7 @@ EXPORT_SYMBOL_GPL(vb2_create_bufs); > > int vb2_qbuf(struct vb2_queue *q, struct v4l2_buffer *b) > { > + struct dma_fence *fence = NULL; > int ret; > > if (vb2_fileio_is_active(q)) { > @@ -568,7 +581,19 @@ int vb2_qbuf(struct vb2_queue *q, struct v4l2_buffer *b) > } > > ret = vb2_queue_or_prepare_buf(q, b, "qbuf"); > - return ret ? ret : vb2_core_qbuf(q, b->index, b); > + if (ret) > + return ret; > + > + if (b->flags & V4L2_BUF_FLAG_IN_FENCE) { > + fence = sync_file_get_fence(b->fence_fd); > + if (!fence) { > + dprintk(1, "failed to get in-fence from fd %d\n", > + b->fence_fd); > + return -EINVAL; > + } > + } > + > + return vb2_core_qbuf(q, b->index, b, fence); > } > EXPORT_SYMBOL_GPL(vb2_qbuf); > > diff --git a/include/media/videobuf2-core.h b/include/media/videobuf2-core.h > index 38b9c8dd42c6..5f48c7be7770 100644 > --- a/include/media/videobuf2-core.h > +++ b/include/media/videobuf2-core.h > @@ -16,6 +16,7 @@ > #include > #include > #include > +#include > > #define VB2_MAX_FRAME (32) > #define VB2_MAX_PLANES (8) > @@ -254,11 +255,20 @@ struct vb2_buffer { > * all buffers queued from userspace > * done_entry: entry on the list that stores all buffers ready > * to be dequeued to userspace > + * in_fence: fence receive from vb2 client to wait on before > + * using the buffer (queueing to the driver) > + * fence_cb: fence callback information > + * fence_cb_lock: protect callback signal/remove > */ > enum vb2_buffer_state state; > > struct list_head queued_entry; > struct list_head done_entry; > + > + struct dma_fence *in_fence; > + struct dma_fence_cb fence_cb; > + spinlock_t fence_cb_lock; > + > #ifdef CONFIG_VIDEO_ADV_DEBUG > /* > * Counters for how often these buffer-related ops are > @@ -504,6 +514,7 @@ struct vb2_buf_ops { > * @last_buffer_dequeued: used in poll() and DQBUF to immediately return if the > * last decoded buffer was already dequeued. Set for capture queues > * when a buffer with the V4L2_BUF_FLAG_LAST is dequeued. > + * @last_fence: last in-fence received. Used to keep ordering. > * @fileio: file io emulator internal data, used only if emulator is active > * @threadio: thread io internal data, used only if thread is active > */ > @@ -558,6 +569,8 @@ struct vb2_queue { > unsigned int copy_timestamp:1; > unsigned int last_buffer_dequeued:1; > > + struct dma_fence *last_fence; > + > struct vb2_fileio_data *fileio; > struct vb2_threadio_data *threadio; > > @@ -733,6 +746,7 @@ int vb2_core_prepare_buf(struct vb2_queue *q, unsigned int index, void *pb); > * @index: id number of the buffer > * @pb: buffer structure passed from userspace to vidioc_qbuf handler > * in driver > + * @fence: in-fence to wait on before queueing the buffer > * > * Should be called from vidioc_qbuf ioctl handler of a driver. > * The passed buffer should have been verified. > @@ -747,7 +761,8 @@ int vb2_core_prepare_buf(struct vb2_queue *q, unsigned int index, void *pb); > * The return values from this function are intended to be directly returned > * from vidioc_qbuf handler in driver. > */ > -int vb2_core_qbuf(struct vb2_queue *q, unsigned int index, void *pb); > +int vb2_core_qbuf(struct vb2_queue *q, unsigned int index, void *pb, > + struct dma_fence *fence); > > /** > * vb2_core_dqbuf() - Dequeue a buffer to the userspace -- Thanks, Mauro From 1584340941939093912@xxx Fri Nov 17 19:01:04 +0000 2017 X-GM-THRID: 1584155088810136583 X-Gmail-Labels: Inbox,Category Forums,HistoricalUnread