From patchwork Thu Jan 5 10:41:55 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumit Semwal X-Patchwork-Id: 6064 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id C97E023E13 for ; Thu, 5 Jan 2012 10:42:19 +0000 (UTC) Received: from mail-ey0-f180.google.com (mail-ey0-f180.google.com [209.85.215.180]) by fiordland.canonical.com (Postfix) with ESMTP id BC114A1824B for ; Thu, 5 Jan 2012 10:42:19 +0000 (UTC) Received: by mail-ey0-f180.google.com with SMTP id c11so311202eaa.11 for ; Thu, 05 Jan 2012 02:42:19 -0800 (PST) Received: by 10.204.156.219 with SMTP id y27mr542777bkw.71.1325760138874; Thu, 05 Jan 2012 02:42:18 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.205.82.144 with SMTP id ac16cs397771bkc; Thu, 5 Jan 2012 02:42:18 -0800 (PST) Received: by 10.236.129.173 with SMTP id h33mr717542yhi.14.1325760136810; Thu, 05 Jan 2012 02:42:16 -0800 (PST) Received: from devils.ext.ti.com (devils.ext.ti.com. [198.47.26.153]) by mx.google.com with ESMTPS id y10si8020891ank.75.2012.01.05.02.42.16 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 05 Jan 2012 02:42:16 -0800 (PST) Received-SPF: pass (google.com: domain of sumit.semwal@ti.com designates 198.47.26.153 as permitted sender) client-ip=198.47.26.153; Authentication-Results: mx.google.com; spf=pass (google.com: domain of sumit.semwal@ti.com designates 198.47.26.153 as permitted sender) smtp.mail=sumit.semwal@ti.com Received: from dlep26.itg.ti.com ([157.170.170.121]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id q05AgEIV010979; Thu, 5 Jan 2012 04:42:14 -0600 Received: from DLEE74.ent.ti.com (localhost [127.0.0.1]) by dlep26.itg.ti.com (8.13.8/8.13.8) with ESMTP id q05AgEFX027168; Thu, 5 Jan 2012 04:42:14 -0600 (CST) Received: from dlelxv23.itg.ti.com (172.17.1.198) by DLEE74.ent.ti.com (157.170.170.8) with Microsoft SMTP Server id 14.1.323.3; Thu, 5 Jan 2012 04:42:13 -0600 Received: from legion.dal.design.ti.com (legion.dal.design.ti.com [128.247.22.53]) by dlelxv23.itg.ti.com (8.13.8/8.13.8) with ESMTP id q05AgDE3006914; Thu, 5 Jan 2012 04:42:13 -0600 Received: from localhost (a0876505ubnlt.apr.dhcp.ti.com [172.24.137.246]) by legion.dal.design.ti.com (8.11.7p1+Sun/8.11.7) with ESMTP id q05AgAW17068; Thu, 5 Jan 2012 04:42:10 -0600 (CST) From: Sumit Semwal To: , , CC: , , , , , , Sumit Semwal , Sumit Semwal Subject: [RFCv1 1/4] v4l: Add DMABUF as a memory type Date: Thu, 5 Jan 2012 16:11:55 +0530 Message-ID: <1325760118-27997-2-git-send-email-sumit.semwal@ti.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1325760118-27997-1-git-send-email-sumit.semwal@ti.com> References: <1325760118-27997-1-git-send-email-sumit.semwal@ti.com> MIME-Version: 1.0 Adds DMABUF memory type to v4l framework. Also adds the related file descriptor in v4l2_plane and v4l2_buffer. Signed-off-by: Tomasz Stanislawski [original work in the PoC for buffer sharing] Signed-off-by: Sumit Semwal Signed-off-by: Sumit Semwal --- include/linux/videodev2.h | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h index 4b752d5..3c0ade1 100644 --- a/include/linux/videodev2.h +++ b/include/linux/videodev2.h @@ -185,6 +185,7 @@ enum v4l2_memory { V4L2_MEMORY_MMAP = 1, V4L2_MEMORY_USERPTR = 2, V4L2_MEMORY_OVERLAY = 3, + V4L2_MEMORY_DMABUF = 4, }; /* see also http://vektor.theorem.ca/graphics/ycbcr/ */ @@ -574,6 +575,8 @@ struct v4l2_requestbuffers { * should be passed to mmap() called on the video node) * @userptr: when memory is V4L2_MEMORY_USERPTR, a userspace pointer * pointing to this plane + * @fd: when memory is V4L2_MEMORY_DMABUF, a userspace file + * descriptor associated with this plane * @data_offset: offset in the plane to the start of data; usually 0, * unless there is a header in front of the data * @@ -588,6 +591,7 @@ struct v4l2_plane { union { __u32 mem_offset; unsigned long userptr; + int fd; } m; __u32 data_offset; __u32 reserved[11]; @@ -610,6 +614,9 @@ struct v4l2_plane { * (or a "cookie" that should be passed to mmap() as offset) * @userptr: for non-multiplanar buffers with memory == V4L2_MEMORY_USERPTR; * a userspace pointer pointing to this buffer + * @fd: for non-multiplanar buffers with + * memory == V4L2_MEMORY_DMABUF; a userspace file descriptor + * associated with this buffer * @planes: for multiplanar buffers; userspace pointer to the array of plane * info structs for this buffer * @length: size in bytes of the buffer (NOT its payload) for single-plane @@ -636,6 +643,7 @@ struct v4l2_buffer { __u32 offset; unsigned long userptr; struct v4l2_plane *planes; + int fd; } m; __u32 length; __u32 input;