History

Merge branch 'drm-next-5.3' of git://people.freedesktop.org/~agd5f/linux into drm-next

New stuff for 5.3: - Add new thermal sensors for vega asics - Various RAS fixes - Add sysfs interface for memory interface utilization - Use HMM rather than mmu notifier for user pages - Expose xgmi topology via kfd - SR-IOV fixes - Fixes for manual driver reload - Add unique identifier for vega asics - Clean up user fence handling with UVD/VCE/VCN blocks - Convert DC to use core bpc attribute rather than a custom one - Add GWS support for KFD - Vega powerplay improvements - Add CRC support for DCE 12 - SR-IOV support for new security policy - Various cleanups

Dave Airlie committed 7 years ago

Commit 91c1ead2 parents 14ee642 cf401e2202 files · +6414 −2476Browse files

Showing the changes to include/uapi/linux (1 of 202 files). Show all

Unified · Split

include/uapi/linux/kfd_ioctl.h+31−4
@@ -35,9 +35,10 @@ struct kfd_ioctl_get_version_args { · 34 unmodified lines
35};35};
36 36
37/* For kfd_ioctl_create_queue_args.queue_type. */37/* For kfd_ioctl_create_queue_args.queue_type. */
38#define KFD_IOC_QUEUE_TYPE_COMPUTE 038#define KFD_IOC_QUEUE_TYPE_COMPUTE 0x0
39#define KFD_IOC_QUEUE_TYPE_SDMA 139#define KFD_IOC_QUEUE_TYPE_SDMA 0x1
40#define KFD_IOC_QUEUE_TYPE_COMPUTE_AQL 240#define KFD_IOC_QUEUE_TYPE_COMPUTE_AQL 0x2
41#define KFD_IOC_QUEUE_TYPE_SDMA_XGMI 0x3
41 42
42#define KFD_MAX_QUEUE_PERCENTAGE 10043#define KFD_MAX_QUEUE_PERCENTAGE 100
43#define KFD_MAX_QUEUE_PRIORITY 1544#define KFD_MAX_QUEUE_PRIORITY 15
@@ -338,6 +339,7 @@ struct kfd_ioctl_acquire_vm_args { · 294 unmodified lines
338#define KFD_IOC_ALLOC_MEM_FLAGS_GTT (1 << 1)339#define KFD_IOC_ALLOC_MEM_FLAGS_GTT (1 << 1)
339#define KFD_IOC_ALLOC_MEM_FLAGS_USERPTR (1 << 2)340#define KFD_IOC_ALLOC_MEM_FLAGS_USERPTR (1 << 2)
340#define KFD_IOC_ALLOC_MEM_FLAGS_DOORBELL (1 << 3)341#define KFD_IOC_ALLOC_MEM_FLAGS_DOORBELL (1 << 3)
342#define KFD_IOC_ALLOC_MEM_FLAGS_MMIO_REMAP (1 << 4)
341/* Allocation flags: attributes/access options */343/* Allocation flags: attributes/access options */
342#define KFD_IOC_ALLOC_MEM_FLAGS_WRITABLE (1 << 31)344#define KFD_IOC_ALLOC_MEM_FLAGS_WRITABLE (1 << 31)
343#define KFD_IOC_ALLOC_MEM_FLAGS_EXECUTABLE (1 << 30)345#define KFD_IOC_ALLOC_MEM_FLAGS_EXECUTABLE (1 << 30)
@@ -408,6 +410,21 @@ struct kfd_ioctl_unmap_memory_from_gpu_args { · 64 unmodified lines
408 __u32 n_success; /* to/from KFD */410 __u32 n_success; /* to/from KFD */
409};411};
410 412
413/* Allocate GWS for specific queue
414 *
415 * @gpu_id: device identifier
416 * @queue_id: queue's id that GWS is allocated for
417 * @num_gws: how many GWS to allocate
418 * @first_gws: index of the first GWS allocated.
419 * only support contiguous GWS allocation
420 */
421struct kfd_ioctl_alloc_queue_gws_args {
422 __u32 gpu_id; /* to KFD */
423 __u32 queue_id; /* to KFD */
424 __u32 num_gws; /* to KFD */
425 __u32 first_gws; /* from KFD */
426};
427
411struct kfd_ioctl_get_dmabuf_info_args {428struct kfd_ioctl_get_dmabuf_info_args {
412 __u64 size; /* from KFD */429 __u64 size; /* from KFD */
413 __u64 metadata_ptr; /* to KFD */430 __u64 metadata_ptr; /* to KFD */
@@ -426,6 +443,13 @@ struct kfd_ioctl_import_dmabuf_args { · 12 unmodified lines
426 __u32 dmabuf_fd; /* to KFD */443 __u32 dmabuf_fd; /* to KFD */
427};444};
428 445
446/* Register offset inside the remapped mmio page
447 */
448enum kfd_mmio_remap {
449 KFD_MMIO_REMAP_HDP_MEM_FLUSH_CNTL = 0,
450 KFD_MMIO_REMAP_HDP_REG_FLUSH_CNTL = 4,
451};
452
429#define AMDKFD_IOCTL_BASE 'K'453#define AMDKFD_IOCTL_BASE 'K'
430#define AMDKFD_IO(nr) _IO(AMDKFD_IOCTL_BASE, nr)454#define AMDKFD_IO(nr) _IO(AMDKFD_IOCTL_BASE, nr)
431#define AMDKFD_IOR(nr, type) _IOR(AMDKFD_IOCTL_BASE, nr, type)455#define AMDKFD_IOR(nr, type) _IOR(AMDKFD_IOCTL_BASE, nr, type)
@@ -520,7 +544,10 @@ struct kfd_ioctl_import_dmabuf_args { · 88 unmodified lines
520#define AMDKFD_IOC_IMPORT_DMABUF \544#define AMDKFD_IOC_IMPORT_DMABUF \
521 AMDKFD_IOWR(0x1D, struct kfd_ioctl_import_dmabuf_args)545 AMDKFD_IOWR(0x1D, struct kfd_ioctl_import_dmabuf_args)
522 546
547#define AMDKFD_IOC_ALLOC_QUEUE_GWS \
548 AMDKFD_IOWR(0x1E, struct kfd_ioctl_alloc_queue_gws_args)
549
523#define AMDKFD_COMMAND_START 0x01550#define AMDKFD_COMMAND_START 0x01
524#define AMDKFD_COMMAND_END 0x1E551#define AMDKFD_COMMAND_END 0x1F
525 552
526#endif553#endif

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