History

Merge tag 'drm-fixes-5.3-2019-08-07' of git://people.freedesktop.org/~agd5f/linux into drm-fixes

drm-fixes-5.3-2019-08-07: amdgpu: - Fixes VCN to handle the latest navi10 firmware - Fixes for fan control on navi10 - Properly handle SMU metrics table on navi10 - Fix a resume regression on Stoney amdkfd: - Revert new GWS ioctl. It's not ready.

Dave Airlie committed 7 years ago

Commit f5365792 parents abffeda 4b3e30e11 files · +138 −94Browse files

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

Unified · Split

include/uapi/linux/kfd_ioctl.h+1−19
@@ -410,21 +410,6 @@ struct kfd_ioctl_unmap_memory_from_gpu_args { · 409 unmodified lines
410410 __u32 n_success; /* to/from KFD */
411411 };
412412
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− */
421−struct 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−
428413 struct kfd_ioctl_get_dmabuf_info_args {
429414 __u64 size; /* from KFD */
430415 __u64 metadata_ptr; /* to KFD */
@@ -544,10 +529,7 @@ enum kfd_mmio_remap { · 113 unmodified lines
544529 #define AMDKFD_IOC_IMPORT_DMABUF \
545530 AMDKFD_IOWR(0x1D, struct kfd_ioctl_import_dmabuf_args)
546531
547−#define AMDKFD_IOC_ALLOC_QUEUE_GWS \
548− AMDKFD_IOWR(0x1E, struct kfd_ioctl_alloc_queue_gws_args)
549−
550532 #define AMDKFD_COMMAND_START 0x01
551−#define AMDKFD_COMMAND_END 0x1F
533+#define AMDKFD_COMMAND_END 0x1E
552534
553535 #endif