Received: by 10.223.164.202 with SMTP id h10csp910747wrb; Fri, 17 Nov 2017 10:37:30 -0800 (PST) X-Google-Smtp-Source: AGs4zMZtAYSqFddsuC9vdhwDKS5kHEXdOQRMWkEUoutCXir6xglVNX4fuil31gJqVaGo6SIQmLsj X-Received: by 10.98.147.215 with SMTP id r84mr3009271pfk.17.1510943850633; Fri, 17 Nov 2017 10:37:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510943850; cv=none; d=google.com; s=arc-20160816; b=N0x1gntjU/Gk920OqFkIZEUHR7/qMi3cj7Zwm4PFEowme2eRMFDmBGWZUf9hJcI00N HPerBp/gjeIGTvr4HLYJQ/ss+Ngl9xU9vsEmPBKTFjppKdCpCfNfC/wFBFMMG2Etu6f+ QzmbJtlK87zjpghmCvJWj5ayNNbger6BQ64jGcPrv2ZzhpCoTWMMwZMntJtkEW+ZQ4MK i4OK0GGjuJ2Ozzyfjj17vopqXHDCNIix/nhMyDYKlrWIYlV78z80glsCdYXnNE5en61m 4xUzAK8GbcHPLD1nnkDAovs6UZqAwqDsVsIMM/BSZYoAw0r3Lq1Xzoy6GQ1E4PasIYS+ wgdQ== 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=QJhqL1bm1SxaiERtlmV/FTyPZoZ+WTp0QGqswnob/xk=; b=Jwi1/tvRfijqePawzsCdBbI20eRulDVXCaKJeMrbwkxfyjFeLwxcKdtGgCeQK3GO+W 0dK2qYjE5gVt9zuyvxlzmTycTmMT38OHjGjMZCnk1/D26NXRZeRHmQtYSIzGNqX9nsaJ LZNX/wtUCAPSCNlvIUHLTX8J9y81pxAE5/13lsIkLh2U2+IH73CgUiGB6Dp+BNeDqzle h7XPjg6ODWIu2+4eANfORi7xKPPI9dm/vZT/bspOhqrFG061iEPAWLKWJwAsZFMrX3Za 8fqeupuWDJHd3CGZY/F4ZBo2SjHZP2MZBnFTCK1WHvw2d20RPmpUwrSWjb2WMZJE0Pue +xfA== 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 q75si567625pfq.238.2017.11.17.10.37.16; Fri, 17 Nov 2017 10:37:30 -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 S1755561AbdKQM0J (ORCPT + 93 others); Fri, 17 Nov 2017 07:26:09 -0500 Received: from osg.samsung.com ([64.30.133.232]:42548 "EHLO osg.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751950AbdKQM0C (ORCPT ); Fri, 17 Nov 2017 07:26:02 -0500 Received: from localhost (localhost [127.0.0.1]) by osg.samsung.com (Postfix) with ESMTP id B90F42B25A; Fri, 17 Nov 2017 04:26:01 -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 82v9NC3tzuBo; Fri, 17 Nov 2017 04:26:00 -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 7B8A42B252; Fri, 17 Nov 2017 04:25:57 -0800 (PST) Date: Fri, 17 Nov 2017 10:25:54 -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 06/11] [media] vb2: add explicit fence user API Message-ID: <20171117102554.05125c4a@vento.lan> In-Reply-To: <20171115171057.17340-7-gustavo@padovan.org> References: <20171115171057.17340-1-gustavo@padovan.org> <20171115171057.17340-7-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:52 -0200 Gustavo Padovan escreveu: > From: Gustavo Padovan > > Turn the reserved2 field into fence_fd that we will use to send > an in-fence to the kernel and return an out-fence from the kernel to > userspace. > > Two new flags were added, V4L2_BUF_FLAG_IN_FENCE, that should be used > when sending a fence to the kernel to be waited on, and > V4L2_BUF_FLAG_OUT_FENCE, to ask the kernel to give back an out-fence. > > v4: > - make it a union with reserved2 and fence_fd (Hans Verkuil) > > v3: > - make the out_fence refer to the current buffer (Hans Verkuil) > > v2: add documentation > > Signed-off-by: Gustavo Padovan > --- > Documentation/media/uapi/v4l/buffer.rst | 15 +++++++++++++++ > drivers/media/usb/cpia2/cpia2_v4l.c | 2 +- > drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 4 ++-- > drivers/media/v4l2-core/videobuf2-v4l2.c | 2 +- > include/uapi/linux/videodev2.h | 7 ++++++- > 5 files changed, 25 insertions(+), 5 deletions(-) > > diff --git a/Documentation/media/uapi/v4l/buffer.rst b/Documentation/media/uapi/v4l/buffer.rst > index ae6ee73f151c..eeefbd2547e7 100644 > --- a/Documentation/media/uapi/v4l/buffer.rst > +++ b/Documentation/media/uapi/v4l/buffer.rst > @@ -648,6 +648,21 @@ Buffer Flags > - Start Of Exposure. The buffer timestamp has been taken when the > exposure of the frame has begun. This is only valid for the > ``V4L2_BUF_TYPE_VIDEO_CAPTURE`` buffer type. > + * .. _`V4L2-BUF-FLAG-IN-FENCE`: > + > + - ``V4L2_BUF_FLAG_IN_FENCE`` > + - 0x00200000 > + - Ask V4L2 to wait on fence passed in ``fence_fd`` field. The buffer > + won't be queued to the driver until the fence signals. > + > + * .. _`V4L2-BUF-FLAG-OUT-FENCE`: > + > + - ``V4L2_BUF_FLAG_OUT_FENCE`` > + - 0x00400000 > + - Request a fence to be attached to the buffer. The ``fence_fd`` > + field on > + :ref:`VIDIOC_QBUF` is used as a return argument to send the out-fence > + fd to userspace. > > > > diff --git a/drivers/media/usb/cpia2/cpia2_v4l.c b/drivers/media/usb/cpia2/cpia2_v4l.c > index 3dedd83f0b19..6cde686bf44c 100644 > --- a/drivers/media/usb/cpia2/cpia2_v4l.c > +++ b/drivers/media/usb/cpia2/cpia2_v4l.c > @@ -948,7 +948,7 @@ static int cpia2_dqbuf(struct file *file, void *fh, struct v4l2_buffer *buf) > buf->sequence = cam->buffers[buf->index].seq; > buf->m.offset = cam->buffers[buf->index].data - cam->frame_buffer; > buf->length = cam->frame_size; > - buf->reserved2 = 0; > + buf->fence_fd = -1; > buf->reserved = 0; > memset(&buf->timecode, 0, sizeof(buf->timecode)); > > diff --git a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c > index 821f2aa299ae..3a31d318df2a 100644 > --- a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c > +++ b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c > @@ -370,7 +370,7 @@ struct v4l2_buffer32 { > __s32 fd; > } m; > __u32 length; > - __u32 reserved2; > + __s32 fence_fd; > __u32 reserved; > }; > > @@ -533,7 +533,7 @@ static int put_v4l2_buffer32(struct v4l2_buffer *kp, struct v4l2_buffer32 __user > put_user(kp->timestamp.tv_usec, &up->timestamp.tv_usec) || > copy_to_user(&up->timecode, &kp->timecode, sizeof(struct v4l2_timecode)) || > put_user(kp->sequence, &up->sequence) || > - put_user(kp->reserved2, &up->reserved2) || > + put_user(kp->fence_fd, &up->fence_fd) || > put_user(kp->reserved, &up->reserved) || > put_user(kp->length, &up->length)) > return -EFAULT; > diff --git a/drivers/media/v4l2-core/videobuf2-v4l2.c b/drivers/media/v4l2-core/videobuf2-v4l2.c > index 0c0669976bdc..110fb45fef6f 100644 > --- a/drivers/media/v4l2-core/videobuf2-v4l2.c > +++ b/drivers/media/v4l2-core/videobuf2-v4l2.c > @@ -203,7 +203,7 @@ 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->reserved2 = 0; > + b->fence_fd = -1; > b->reserved = 0; > > if (q->is_multiplanar) { > diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h > index cd6fc1387f47..311c3a331eda 100644 > --- a/include/uapi/linux/videodev2.h > +++ b/include/uapi/linux/videodev2.h > @@ -925,7 +925,10 @@ struct v4l2_buffer { > __s32 fd; > } m; > __u32 length; > - __u32 reserved2; > + union { > + __s32 fence_fd; You forgot to document the fence_fd at the uAPI book. In particular, it should be noticed there that a non-positive value means no fence. (as userspace should be setting reserved2 to zero, I'm assuming that we'll likely not accept 0 here). You should likely also remove the description from reserved2 at Documentation/media/uapi/v4l/buffer.rst. > + __u32 reserved2; > + }; > __u32 reserved; > }; > > @@ -962,6 +965,8 @@ struct v4l2_buffer { > #define V4L2_BUF_FLAG_TSTAMP_SRC_SOE 0x00010000 > /* mem2mem encoder/decoder */ > #define V4L2_BUF_FLAG_LAST 0x00100000 > +#define V4L2_BUF_FLAG_IN_FENCE 0x00200000 > +#define V4L2_BUF_FLAG_OUT_FENCE 0x00400000 > > /** > * struct v4l2_exportbuffer - export of video buffer as DMABUF file descriptor -- Thanks, Mauro From 1584163030429422174@xxx Wed Nov 15 19:53:15 +0000 2017 X-GM-THRID: 1584163030429422174 X-Gmail-Labels: Inbox,Category Forums,HistoricalUnread