History

Merge drm/drm-next into drm-intel-next

Need to take some Xe bo definition in here before we can add the BMG display 64k aligned size restrictions.

Rodrigo Vivi committed 2 years ago

Commit 04cf4202 parents 67733d7 e55ef652025 files · +37408 −22062Browse files

Showing the changes to include/uapi (9 of 2025 files). Show all

Unified · Split

9 files
  1. include/uapi/asm-generic/unistd.h +1 −4
  2. include/uapi/drm/drm_mode.h +2 −0
  3. include/uapi/drm/xe_drm.h +13 −5
  4. include/uapi/linux/io_uring.h +1 −1
  5. include/uapi/linux/kfd_ioctl.h +5 −1
  6. include/uapi/linux/nsfs.h +2 −1
  7. include/uapi/linux/psp-sev.h +1 −0
  8. include/uapi/linux/virtio_gpu.h +1 −0
  9. include/uapi/misc/fastrpc.h +0 −3
include/uapi/asm-generic/unistd.h+1−4
@@ -841,11 +841,8 @@ __SYSCALL(__NR_lsm_list_modules, sys_lsm_list_modules) · 840 unmodified lines
841841 #define __NR_mseal 462
842842 __SYSCALL(__NR_mseal, sys_mseal)
843843
844−#define __NR_uretprobe 463
845−__SYSCALL(__NR_uretprobe, sys_uretprobe)
846−
847844 #undef __NR_syscalls
848−#define __NR_syscalls 464
845+#define __NR_syscalls 463
849846
850847 /*
851848 * 32 bit systems traditionally used different
include/uapi/drm/drm_mode.h+2−0
@@ -859,6 +859,8 @@ struct drm_color_lut { · 858 unmodified lines
859859
860860 /**
861861 * struct drm_plane_size_hint - Plane size hints
862+ * @width: The width of the plane in pixel
863+ * @height: The height of the plane in pixel
862864 *
863865 * The plane SIZE_HINTS property blob contains an
864866 * array of struct drm_plane_size_hint.
include/uapi/drm/xe_drm.h+13−5
@@ -517,7 +517,14 @@ struct drm_xe_query_gt_list { · 516 unmodified lines
517517 * available per Dual Sub Slices (DSS). For example a query response
518518 * containing the following in mask:
519519 * ``EU_PER_DSS ff ff 00 00 00 00 00 00``
520− * means each DSS has 16 EU.
520+ * means each DSS has 16 SIMD8 EUs. This type may be omitted if device
521+ * doesn't have SIMD8 EUs.
522+ * - %DRM_XE_TOPO_SIMD16_EU_PER_DSS - To query the mask of SIMD16 Execution
523+ * Units (EU) available per Dual Sub Slices (DSS). For example a query
524+ * response containing the following in mask:
525+ * ``SIMD16_EU_PER_DSS ff ff 00 00 00 00 00 00``
526+ * means each DSS has 16 SIMD16 EUs. This type may be omitted if device
527+ * doesn't have SIMD16 EUs.
521528 */
522529 struct drm_xe_query_topology_mask {
523530 /** @gt_id: GT ID the mask is associated with */
@@ -527,6 +534,7 @@ struct drm_xe_query_topology_mask { · 3 unmodified lines
527534 #define DRM_XE_TOPO_DSS_COMPUTE 2
528535 #define DRM_XE_TOPO_L3_BANK 3
529536 #define DRM_XE_TOPO_EU_PER_DSS 4
537+#define DRM_XE_TOPO_SIMD16_EU_PER_DSS 5
530538 /** @type: type of mask */
531539 __u16 type;
532540
@@ -1590,10 +1598,10 @@ enum drm_xe_oa_property_id { · 1057 unmodified lines
15901598 * b. Counter select c. Counter size and d. BC report. Also refer to the
15911599 * oa_formats array in drivers/gpu/drm/xe/xe_oa.c.
15921600 */
1593−#define DRM_XE_OA_FORMAT_MASK_FMT_TYPE (0xff << 0)
1594−#define DRM_XE_OA_FORMAT_MASK_COUNTER_SEL (0xff << 8)
1595−#define DRM_XE_OA_FORMAT_MASK_COUNTER_SIZE (0xff << 16)
1596−#define DRM_XE_OA_FORMAT_MASK_BC_REPORT (0xff << 24)
1601+#define DRM_XE_OA_FORMAT_MASK_FMT_TYPE (0xffu << 0)
1602+#define DRM_XE_OA_FORMAT_MASK_COUNTER_SEL (0xffu << 8)
1603+#define DRM_XE_OA_FORMAT_MASK_COUNTER_SIZE (0xffu << 16)
1604+#define DRM_XE_OA_FORMAT_MASK_BC_REPORT (0xffu << 24)
15971605
15981606 /**
15991607 * @DRM_XE_OA_PROPERTY_OA_PERIOD_EXPONENT: Requests periodic OA unit
include/uapi/linux/io_uring.h+1−1
@@ -421,7 +421,7 @@ enum io_uring_msg_ring_flags { · 420 unmodified lines
421421 * IO completion data structure (Completion Queue Entry)
422422 */
423423 struct io_uring_cqe {
424− __u64 user_data; /* sqe->data submission passed back */
424+ __u64 user_data; /* sqe->user_data value passed back */
425425 __s32 res; /* result code for this event */
426426 __u32 flags;
427427
include/uapi/linux/kfd_ioctl.h+5−1
@@ -42,9 +42,10 @@ · 41 unmodified lines
4242 * - 1.14 - Update kfd_event_data
4343 * - 1.15 - Enable managing mappings in compute VMs with GEM_VA ioctl
4444 * - 1.16 - Add contiguous VRAM allocation flag
45+ * - 1.17 - Add SDMA queue creation with target SDMA engine ID
4546 */
4647 #define KFD_IOCTL_MAJOR_VERSION 1
47−#define KFD_IOCTL_MINOR_VERSION 16
48+#define KFD_IOCTL_MINOR_VERSION 17
4849
4950 struct kfd_ioctl_get_version_args {
5051 __u32 major_version; /* from KFD */
@@ -56,6 +57,7 @@ struct kfd_ioctl_get_version_args { · 5 unmodified lines
5657 #define KFD_IOC_QUEUE_TYPE_SDMA 0x1
5758 #define KFD_IOC_QUEUE_TYPE_COMPUTE_AQL 0x2
5859 #define KFD_IOC_QUEUE_TYPE_SDMA_XGMI 0x3
60+#define KFD_IOC_QUEUE_TYPE_SDMA_BY_ENG_ID 0x4
5961
6062 #define KFD_MAX_QUEUE_PERCENTAGE 100
6163 #define KFD_MAX_QUEUE_PRIORITY 15
@@ -78,6 +80,8 @@ struct kfd_ioctl_create_queue_args { · 16 unmodified lines
7880 __u64 ctx_save_restore_address; /* to KFD */
7981 __u32 ctx_save_restore_size; /* to KFD */
8082 __u32 ctl_stack_size; /* to KFD */
83+ __u32 sdma_engine_id; /* to KFD */
84+ __u32 pad;
8185 };
8286
8387 struct kfd_ioctl_destroy_queue_args {
include/uapi/linux/nsfs.h+2−1
@@ -3,6 +3,7 @@ · 2 unmodified lines
33 #define __LINUX_NSFS_H
44
55 #include <linux/ioctl.h>
6+#include <linux/types.h>
67
78 #define NSIO 0xb7
89
@@ -16,7 +17,7 @@ · 7 unmodified lines
1617 /* Get owner UID (in the caller's user namespace) for a user namespace */
1718 #define NS_GET_OWNER_UID _IO(NSIO, 0x4)
1819 /* Get the id for a mount namespace */
19−#define NS_GET_MNTNS_ID _IO(NSIO, 0x5)
20+#define NS_GET_MNTNS_ID _IOR(NSIO, 0x5, __u64)
2021 /* Translate pid from target pid namespace into the caller's pid namespace. */
2122 #define NS_GET_PID_FROM_PIDNS _IOR(NSIO, 0x6, int)
2223 /* Return thread-group leader id of pid in the callers pid namespace. */
include/uapi/linux/psp-sev.h+1−0
@@ -51,6 +51,7 @@ typedef enum { · 50 unmodified lines
5151 SEV_RET_INVALID_PLATFORM_STATE,
5252 SEV_RET_INVALID_GUEST_STATE,
5353 SEV_RET_INAVLID_CONFIG,
54+ SEV_RET_INVALID_CONFIG = SEV_RET_INAVLID_CONFIG,
5455 SEV_RET_INVALID_LEN,
5556 SEV_RET_ALREADY_OWNED,
5657 SEV_RET_INVALID_CERTIFICATE,
include/uapi/linux/virtio_gpu.h+1−0
@@ -311,6 +311,7 @@ struct virtio_gpu_cmd_submit { · 310 unmodified lines
311311 #define VIRTIO_GPU_CAPSET_VIRGL2 2
312312 /* 3 is reserved for gfxstream */
313313 #define VIRTIO_GPU_CAPSET_VENUS 4
314+#define VIRTIO_GPU_CAPSET_DRM 6
314315
315316 /* VIRTIO_GPU_CMD_GET_CAPSET_INFO */
316317 struct virtio_gpu_get_capset_info {
include/uapi/misc/fastrpc.h+0−3
@@ -8,14 +8,11 @@ · 7 unmodified lines
88 #define FASTRPC_IOCTL_ALLOC_DMA_BUFF _IOWR('R', 1, struct fastrpc_alloc_dma_buf)
99 #define FASTRPC_IOCTL_FREE_DMA_BUFF _IOWR('R', 2, __u32)
1010 #define FASTRPC_IOCTL_INVOKE _IOWR('R', 3, struct fastrpc_invoke)
11−/* This ioctl is only supported with secure device nodes */
1211 #define FASTRPC_IOCTL_INIT_ATTACH _IO('R', 4)
1312 #define FASTRPC_IOCTL_INIT_CREATE _IOWR('R', 5, struct fastrpc_init_create)
1413 #define FASTRPC_IOCTL_MMAP _IOWR('R', 6, struct fastrpc_req_mmap)
1514 #define FASTRPC_IOCTL_MUNMAP _IOWR('R', 7, struct fastrpc_req_munmap)
16−/* This ioctl is only supported with secure device nodes */
1715 #define FASTRPC_IOCTL_INIT_ATTACH_SNS _IO('R', 8)
18−/* This ioctl is only supported with secure device nodes */
1916 #define FASTRPC_IOCTL_INIT_CREATE_STATIC _IOWR('R', 9, struct fastrpc_init_create_static)
2017 #define FASTRPC_IOCTL_MEM_MAP _IOWR('R', 10, struct fastrpc_mem_map)
2118 #define FASTRPC_IOCTL_MEM_UNMAP _IOWR('R', 11, struct fastrpc_mem_unmap)

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t