add dma-heap.h to external
and use it instead of system headers Bug: 411474910 Test: mm ccdec in system/cros-codecs Change-Id: I7a58acaa610e1678a379a4c28886938075e39037
This commit is contained in:
parent
07dac8aaa3
commit
60aa3a0304
2 changed files with 56 additions and 3 deletions
53
external/dma-heap.h
vendored
Normal file
53
external/dma-heap.h
vendored
Normal file
|
|
@ -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 <linux/ioctl.h>
|
||||||
|
#include <linux/types.h>
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 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 (0ULL)
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 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 */
|
||||||
|
|
@ -10,9 +10,6 @@
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
#include <inttypes.h>
|
#include <inttypes.h>
|
||||||
#if !defined(ANDROID) || (ANDROID_API_LEVEL >= 31 && defined(HAS_DMABUF_SYSTEM_HEAP))
|
|
||||||
#include <linux/dma-heap.h>
|
|
||||||
#endif
|
|
||||||
#include <poll.h>
|
#include <poll.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
@ -20,6 +17,9 @@
|
||||||
#include <sys/mman.h>
|
#include <sys/mman.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <xf86drm.h>
|
#include <xf86drm.h>
|
||||||
|
#if !defined(ANDROID) || (ANDROID_API_LEVEL >= 31 && defined(HAS_DMABUF_SYSTEM_HEAP))
|
||||||
|
#include "external/dma-heap.h"
|
||||||
|
#endif
|
||||||
#include "external/mediatek_drm.h"
|
#include "external/mediatek_drm.h"
|
||||||
// clang-format on
|
// clang-format on
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue