From patchwork Wed Jul 15 09:39:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naushir Patuck X-Patchwork-Id: 8820 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 8655ABD790 for ; Wed, 15 Jul 2020 09:39:21 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 0CEAA60993; Wed, 15 Jul 2020 11:39:21 +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="jhYxQPfh"; dkim-atps=neutral Received: from mail-wr1-x443.google.com (mail-wr1-x443.google.com [IPv6:2a00:1450:4864:20::443]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id A4DBA605B0 for ; Wed, 15 Jul 2020 11:39:19 +0200 (CEST) Received: by mail-wr1-x443.google.com with SMTP id z2so1743111wrp.2 for ; Wed, 15 Jul 2020 02:39:19 -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:mime-version :content-transfer-encoding; bh=qMWF/tn7sh4I9tmtx0QCFi1d0CsjwBBNPrQwF1OtyZ0=; b=jhYxQPfhZcRct/IxNZ5zQ2tLREF2iAbQIcugqvBvGu1wzu/CXJnL2itDKE4DIk3G47 7fTW6gEvDwKgSZ6USC31RUNuFgQ2tTWiQUgf48uiBTeuzKBZDDzyg0XqexEfnpaIlmyJ Xez7S58Ac0jUQLpOLLgP/hyv+QnFDHYCqaGeo+llD2GE12xRFQBKqnPm9Ij74P8PVwBt 3wFr2CkWNmGc/vKQNXtR3g4l6v/pqmxYZzXi4FToWrCF7F0umvgeO7OGPD7i21dYU5x2 XpCV9WWaLkuPDfiQDc7t86fDcBjX7Pw9KNwqouEXI8FTAgkGb0NGKvFUJD+OWn0Gp1yV Hrow== 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:mime-version :content-transfer-encoding; bh=qMWF/tn7sh4I9tmtx0QCFi1d0CsjwBBNPrQwF1OtyZ0=; b=LS31eCLO8rbS8hQSxZAqCdmWvZwvfcuIt6lkHnDzTCg0gxvmDe2cj5WfxByh1Urmkk IxSaZXOVxLFz3vXqZsXLlZmmJ8COeRQftCdiqyr4PdoEZkKVn12mX+6En8siMRHLcvY6 o6aCdtac69RZnctBtEGoRKAcCSN4dpfei07dP0tk5zOScrNWFUQY7U+nro+GMFKsZ68q ZT8egXXLXqABJ//VCc2Nd/4xQGXe5DKzODeXLLGbm34kESoNyRDg5CcYsPzyk3Yct6Ml dW4+pY25+onMKB3Oc4BmFXdHyawZ4AqevHTFYQOslQpMoYSFnBEvMFWwaZe7/uUXW7Xq Qx7w== X-Gm-Message-State: AOAM531ygrSubnSj/+qVewDWqTV65APcIRx+wAb1Ez0QGqcpslJnZfWK N+CHGpMPRrDibQX3A2rJSQtrGuj7tjo= X-Google-Smtp-Source: ABdhPJxd1scXGPHmTile5aNeOOjbLawDdDoyWI3QfnNYc72RiDxoVEDQ6yfAvVWmaf6AWlSPooZXcA== X-Received: by 2002:adf:f504:: with SMTP id q4mr10165164wro.163.1594805958714; Wed, 15 Jul 2020 02:39:18 -0700 (PDT) Received: from naushir-VirtualBox.patuck.local ([88.97.76.4]) by smtp.gmail.com with ESMTPSA id j145sm2730785wmj.7.2020.07.15.02.39.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jul 2020 02:39:17 -0700 (PDT) From: Naushir Patuck To: libcamera-devel@lists.libcamera.org Date: Wed, 15 Jul 2020 10:39:10 +0100 Message-Id: <20200715093911.554684-1-naush@raspberrypi.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2 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" This commit adds the dmabuf UAPI headers from the mainline Linux kernel v5.6.19. They are required by 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 */