Sync with drm-next to get the new logging macros, among other things.
Showing the changes to include/uapi (3 of 1334 files). Show all
Unified · Split
| @@ -703,6 +703,9 @@ struct drm_amdgpu_cs_chunk_data { · 702 unmodified lines | |||
| 703 | /* Subquery id: Query DMCU firmware version */ | 703 | /* Subquery id: Query DMCU firmware version */ |
| 704 | #define AMDGPU_INFO_FW_DMCU 0x12 | 704 | #define AMDGPU_INFO_FW_DMCU 0x12 |
| 705 | #define AMDGPU_INFO_FW_TA 0x13 | 705 | #define AMDGPU_INFO_FW_TA 0x13 |
| 706 | /* Subquery id: Query DMCUB firmware version */ | ||
| 707 | #define AMDGPU_INFO_FW_DMCUB 0x14 | ||
| 708 | |||
| 706 | /* number of bytes moved for TTM migration */ | 709 | /* number of bytes moved for TTM migration */ |
| 707 | #define AMDGPU_INFO_NUM_BYTES_MOVED 0x0f | 710 | #define AMDGPU_INFO_NUM_BYTES_MOVED 0x0f |
| 708 | /* the used VRAM size */ | 711 | /* the used VRAM size */ |
| @@ -0,0 +1,53 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ | ||
| 2 | /* | ||
| 3 | * DMABUF Heaps Userspace API | ||
| 4 | * | ||
| 5 | * Copyright (C) 2011 Google, Inc. | ||
| 6 | * Copyright (C) 2019 Linaro Ltd. | ||
| 7 | */ | ||
| 8 | #ifndef _UAPI_LINUX_DMABUF_POOL_H | ||
| 9 | #define _UAPI_LINUX_DMABUF_POOL_H | ||
| 10 | |||
| 11 | #include <linux/ioctl.h> | ||
| 12 | #include <linux/types.h> | ||
| 13 | |||
| 14 | /** | ||
| 15 | * DOC: DMABUF Heaps Userspace API | ||
| 16 | */ | ||
| 17 | |||
| 18 | /* Valid FD_FLAGS are O_CLOEXEC, O_RDONLY, O_WRONLY, O_RDWR */ | ||
| 19 | #define DMA_HEAP_VALID_FD_FLAGS (O_CLOEXEC | O_ACCMODE) | ||
| 20 | |||
| 21 | /* Currently no heap flags */ | ||
| 22 | #define DMA_HEAP_VALID_HEAP_FLAGS (0) | ||
| 23 | |||
| 24 | /** | ||
| 25 | * struct dma_heap_allocation_data - metadata passed from userspace for | ||
| 26 | * allocations | ||
| 27 | * @len: size of the allocation | ||
| 28 | * @fd: will be populated with a fd which provides the | ||
| 29 | * handle to the allocated dma-buf | ||
| 30 | * @fd_flags: file descriptor flags used when allocating | ||
| 31 | * @heap_flags: flags passed to heap | ||
| 32 | * | ||
| 33 | * Provided by userspace as an argument to the ioctl | ||
| 34 | */ | ||
| 35 | struct dma_heap_allocation_data { | ||
| 36 | __u64 len; | ||
| 37 | __u32 fd; | ||
| 38 | __u32 fd_flags; | ||
| 39 | __u64 heap_flags; | ||
| 40 | }; | ||
| 41 | |||
| 42 | #define DMA_HEAP_IOC_MAGIC 'H' | ||
| 43 | |||
| 44 | /** | ||
| 45 | * DOC: DMA_HEAP_IOCTL_ALLOC - allocate memory from pool | ||
| 46 | * | ||
| 47 | * Takes a dma_heap_allocation_data struct and returns it with the fd field | ||
| 48 | * populated with the dmabuf handle of the allocation. | ||
| 49 | */ | ||
| 50 | #define DMA_HEAP_IOCTL_ALLOC _IOWR(DMA_HEAP_IOC_MAGIC, 0x0,\ | ||
| 51 | struct dma_heap_allocation_data) | ||
| 52 | |||
| 53 | #endif /* _UAPI_LINUX_DMABUF_POOL_H */ | ||
| @@ -48,6 +48,7 @@ struct io_uring_sqe { · 47 unmodified lines | |||
| 48 | #define IOSQE_FIXED_FILE (1U << 0) /* use fixed fileset */ | 48 | #define IOSQE_FIXED_FILE (1U << 0) /* use fixed fileset */ |
| 49 | #define IOSQE_IO_DRAIN (1U << 1) /* issue after inflight IO */ | 49 | #define IOSQE_IO_DRAIN (1U << 1) /* issue after inflight IO */ |
| 50 | #define IOSQE_IO_LINK (1U << 2) /* links next sqe */ | 50 | #define IOSQE_IO_LINK (1U << 2) /* links next sqe */ |
| 51 | #define IOSQE_IO_HARDLINK (1U << 3) /* like LINK, but stronger */ | ||
| 51 | 52 | ||
| 52 | /* | 53 | /* |
| 53 | * io_uring_setup() flags | 54 | * io_uring_setup() flags |
| @@ -57,23 +58,28 @@ struct io_uring_sqe { · 3 unmodified lines | |||
| 57 | #define IORING_SETUP_SQ_AFF (1U << 2) /* sq_thread_cpu is valid */ | 58 | #define IORING_SETUP_SQ_AFF (1U << 2) /* sq_thread_cpu is valid */ |
| 58 | #define IORING_SETUP_CQSIZE (1U << 3) /* app defines CQ size */ | 59 | #define IORING_SETUP_CQSIZE (1U << 3) /* app defines CQ size */ |
| 59 | 60 | ||
| 60 | #define IORING_OP_NOP 0 | 61 | enum { |
| 61 | #define IORING_OP_READV 1 | 62 | IORING_OP_NOP, |
| 62 | #define IORING_OP_WRITEV 2 | 63 | IORING_OP_READV, |
| 63 | #define IORING_OP_FSYNC 3 | 64 | IORING_OP_WRITEV, |
| 64 | #define IORING_OP_READ_FIXED 4 | 65 | IORING_OP_FSYNC, |
| 65 | #define IORING_OP_WRITE_FIXED 5 | 66 | IORING_OP_READ_FIXED, |
| 66 | #define IORING_OP_POLL_ADD 6 | 67 | IORING_OP_WRITE_FIXED, |
| 67 | #define IORING_OP_POLL_REMOVE 7 | 68 | IORING_OP_POLL_ADD, |
| 68 | #define IORING_OP_SYNC_FILE_RANGE 8 | 69 | IORING_OP_POLL_REMOVE, |
| 69 | #define IORING_OP_SENDMSG 9 | 70 | IORING_OP_SYNC_FILE_RANGE, |
| 70 | #define IORING_OP_RECVMSG 10 | 71 | IORING_OP_SENDMSG, |
| 71 | #define IORING_OP_TIMEOUT 11 | 72 | IORING_OP_RECVMSG, |
| 72 | #define IORING_OP_TIMEOUT_REMOVE 12 | 73 | IORING_OP_TIMEOUT, |
| 73 | #define IORING_OP_ACCEPT 13 | 74 | IORING_OP_TIMEOUT_REMOVE, |
| 74 | #define IORING_OP_ASYNC_CANCEL 14 | 75 | IORING_OP_ACCEPT, |
| 75 | #define IORING_OP_LINK_TIMEOUT 15 | 76 | IORING_OP_ASYNC_CANCEL, |
| 76 | #define IORING_OP_CONNECT 16 | 77 | IORING_OP_LINK_TIMEOUT, |
| 78 | IORING_OP_CONNECT, | ||
| 79 | |||
| 80 | /* this goes last, obviously */ | ||
| 81 | IORING_OP_LAST, | ||
| 82 | }; | ||
| 77 | 83 | ||
| 78 | /* | 84 | /* |
| 79 | * sqe->fsync_flags | 85 | * sqe->fsync_flags |