From patchwork Tue Jul 14 12:08:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naushir Patuck X-Patchwork-Id: 8797 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 62EE0BD792 for ; Tue, 14 Jul 2020 12:14:40 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id E569D605B2; Tue, 14 Jul 2020 14:14:39 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="Ee5ibDkB"; dkim-atps=neutral Received: from mail-wm1-x341.google.com (mail-wm1-x341.google.com [IPv6:2a00:1450:4864:20::341]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 524DC605B0 for ; Tue, 14 Jul 2020 14:14:38 +0200 (CEST) Received: by mail-wm1-x341.google.com with SMTP id l2so5387236wmf.0 for ; Tue, 14 Jul 2020 05:14:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=a9Loag3vU7o7sdv8trSEnGIpWj4uQQrk5++P+hlVSEM=; b=Ee5ibDkBbwFGbUhsUOVCoAoF2tF8lIhXQF/MRicqXHhAad2unE0doC+MSUkzM5yRJl GSRA2MumSbnPqBtpDFSXuRIwlyaEhSE5uY+wW3bS02VvQTlHdQmg5e+m320LuedTqbwm GFgh76JgxWvhPIOS3im5nNlq0u8lpXNITz4olm0W3QMEuALXkLNVpA1OnpHGNS7d9Uvi CdBd5qx7R68IWVHC4Hy87/LUs1SgNfPG4wFDjo/ElHu551AH7Soh8ohr3lvBXsI1+M7m sUeXKWgbyszvkBcrErcU3xx4SDTOXSQJKQ4vvC7RUgF3OIJOLI5+XYlDB6kYAk+Kzerq 3U3g== 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:mime-version:content-transfer-encoding; bh=a9Loag3vU7o7sdv8trSEnGIpWj4uQQrk5++P+hlVSEM=; b=C+dZqm+HUWLDBU8gRYtqzNoQiuDNvCK1CyPIlfU2BF6OeuafLCIlkvWJtGk5GFfJ3H a18wVEW9ZYSBAK/nHSwZCSDw99088JI2iR6fzxLVXw7ZRFErB+huxu4oA1BPlTakq8wZ TnPnYmNrgCm0Qw2/G3xIyT4trQm5oOw/xVqZqw/9mIC25qeDR4CG1JUxdjiY/9KmPp+a OC6rwghB8227uhva53T5Sdcxj/QU3Q8k51eJzdsnEQNnj8jvOIDFMCyfkuYTvl2UtOrs b3M201vRwh+tZubClUO93EPE78QnvJOSPczW8Tk9uQptlNHVJgMlXhS+WIUH7U1dhgjv K9cA== X-Gm-Message-State: AOAM530i8hq6JMYK0sxHLpALhNKjFSs5vDFcEMvriTi2tASPpjBMPXcK ypkK83U0+H8jErVV46rY/6gkyvn1Bfk= X-Google-Smtp-Source: ABdhPJz2yPATvfgvApLbXkDMu5Ivhm0+HyYHaIYtBNfyY1xkY56/NWR0NIkrnP2YZnn6ckVQNQkeTA== X-Received: by 2002:a05:600c:218f:: with SMTP id e15mr3818374wme.63.1594728532081; Tue, 14 Jul 2020 05:08:52 -0700 (PDT) Received: from naushir-VirtualBox.patuck.local ([88.97.76.4]) by smtp.gmail.com with ESMTPSA id a15sm33123217wrh.54.2020.07.14.05.08.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Jul 2020 05:08:51 -0700 (PDT) From: Naushir Patuck To: libcamera-devel@lists.libcamera.org Date: Tue, 14 Jul 2020 13:08:43 +0100 Message-Id: <20200714120844.520732-2-naush@raspberrypi.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200714120844.520732-1-naush@raspberrypi.com> References: <20200714120844.520732-1-naush@raspberrypi.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 1/2] include: linux: Add dma-buf.h and dma-heap.h uapi headers X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" These are required for the Raspberry Pi library for lens shading table allocations. Signed-off-by: Naushir Patuck Reviewed-by: Laurent Pinchart --- include/linux/dma-buf.h | 50 +++++++++++++++++++++++++++++++++++++ include/linux/dma-heap.h | 53 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 103 insertions(+) create mode 100644 include/linux/dma-buf.h create mode 100644 include/linux/dma-heap.h diff --git a/include/linux/dma-buf.h b/include/linux/dma-buf.h new file mode 100644 index 00000000..7f30393b --- /dev/null +++ b/include/linux/dma-buf.h @@ -0,0 +1,50 @@ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * Framework for buffer objects that can be shared across devices/subsystems. + * + * Copyright(C) 2015 Intel Ltd + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 as published by + * the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along with + * this program. If not, see . + */ + +#ifndef _DMA_BUF_UAPI_H_ +#define _DMA_BUF_UAPI_H_ + +#include + +/* begin/end dma-buf functions used for userspace mmap. */ +struct dma_buf_sync { + __u64 flags; +}; + +#define DMA_BUF_SYNC_READ (1 << 0) +#define DMA_BUF_SYNC_WRITE (2 << 0) +#define DMA_BUF_SYNC_RW (DMA_BUF_SYNC_READ | DMA_BUF_SYNC_WRITE) +#define DMA_BUF_SYNC_START (0 << 2) +#define DMA_BUF_SYNC_END (1 << 2) +#define DMA_BUF_SYNC_VALID_FLAGS_MASK \ + (DMA_BUF_SYNC_RW | DMA_BUF_SYNC_END) + +#define DMA_BUF_NAME_LEN 32 + +#define DMA_BUF_BASE 'b' +#define DMA_BUF_IOCTL_SYNC _IOW(DMA_BUF_BASE, 0, struct dma_buf_sync) + +/* 32/64bitness of this uapi was botched in android, there's no difference + * between them in actual uapi, they're just different numbers. + */ +#define DMA_BUF_SET_NAME _IOW(DMA_BUF_BASE, 1, const char *) +#define DMA_BUF_SET_NAME_A _IOW(DMA_BUF_BASE, 1, u32) +#define DMA_BUF_SET_NAME_B _IOW(DMA_BUF_BASE, 1, u64) + +#endif diff --git a/include/linux/dma-heap.h b/include/linux/dma-heap.h new file mode 100644 index 00000000..6f84fa08 --- /dev/null +++ b/include/linux/dma-heap.h @@ -0,0 +1,53 @@ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * DMABUF Heaps Userspace API + * + * Copyright (C) 2011 Google, Inc. + * Copyright (C) 2019 Linaro Ltd. + */ +#ifndef _UAPI_LINUX_DMABUF_POOL_H +#define _UAPI_LINUX_DMABUF_POOL_H + +#include +#include + +/** + * DOC: DMABUF Heaps Userspace API + */ + +/* Valid FD_FLAGS are O_CLOEXEC, O_RDONLY, O_WRONLY, O_RDWR */ +#define DMA_HEAP_VALID_FD_FLAGS (O_CLOEXEC | O_ACCMODE) + +/* Currently no heap flags */ +#define DMA_HEAP_VALID_HEAP_FLAGS (0) + +/** + * struct dma_heap_allocation_data - metadata passed from userspace for + * allocations + * @len: size of the allocation + * @fd: will be populated with a fd which provides the + * handle to the allocated dma-buf + * @fd_flags: file descriptor flags used when allocating + * @heap_flags: flags passed to heap + * + * Provided by userspace as an argument to the ioctl + */ +struct dma_heap_allocation_data { + __u64 len; + __u32 fd; + __u32 fd_flags; + __u64 heap_flags; +}; + +#define DMA_HEAP_IOC_MAGIC 'H' + +/** + * DOC: DMA_HEAP_IOCTL_ALLOC - allocate memory from pool + * + * Takes a dma_heap_allocation_data struct and returns it with the fd field + * populated with the dmabuf handle of the allocation. + */ +#define DMA_HEAP_IOCTL_ALLOC _IOWR(DMA_HEAP_IOC_MAGIC, 0x0,\ + struct dma_heap_allocation_data) + +#endif /* _UAPI_LINUX_DMABUF_POOL_H */