From 2aa89d8bf482ccd6d746a87c25ed62dbeb360a27 Mon Sep 17 00:00:00 2001 From: Amber Lin Date: Mon, 27 Apr 2020 09:14:37 -0400 Subject: [PATCH] libhsakmt: Sync up the ioctl number Update the non-upstream ioctl numbers to align with the change in the kernel. Signed-off-by: Amber Lin Change-Id: Ie0ddccb343a023b55eb18477c59341acaa666e99 [ROCm/ROCR-Runtime commit: a37a88ddcbb2a2d9f67dd0c8d6b2ed02d9f35662] --- projects/rocr-runtime/include/linux/kfd_ioctl.h | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/projects/rocr-runtime/include/linux/kfd_ioctl.h b/projects/rocr-runtime/include/linux/kfd_ioctl.h index fa14bd44a3..aa4292e629 100644 --- a/projects/rocr-runtime/include/linux/kfd_ioctl.h +++ b/projects/rocr-runtime/include/linux/kfd_ioctl.h @@ -692,19 +692,23 @@ struct kfd_ioctl_cross_memory_copy_args { #define AMDKFD_IOC_ALLOC_QUEUE_GWS \ AMDKFD_IOWR(0x1E, struct kfd_ioctl_alloc_queue_gws_args) +#define AMDKFD_COMMAND_START 0x01 +#define AMDKFD_COMMAND_END 0x1F + +/* non-upstream ioctls */ #define AMDKFD_IOC_IPC_IMPORT_HANDLE \ - AMDKFD_IOWR(0x1F, struct kfd_ioctl_ipc_import_handle_args) + AMDKFD_IOWR(0x80, struct kfd_ioctl_ipc_import_handle_args) #define AMDKFD_IOC_IPC_EXPORT_HANDLE \ - AMDKFD_IOWR(0x20, struct kfd_ioctl_ipc_export_handle_args) + AMDKFD_IOWR(0x81, struct kfd_ioctl_ipc_export_handle_args) #define AMDKFD_IOC_DBG_TRAP \ - AMDKFD_IOWR(0x21, struct kfd_ioctl_dbg_trap_args) + AMDKFD_IOWR(0x82, struct kfd_ioctl_dbg_trap_args) #define AMDKFD_IOC_CROSS_MEMORY_COPY \ - AMDKFD_IOWR(0x22, struct kfd_ioctl_cross_memory_copy_args) + AMDKFD_IOWR(0x83, struct kfd_ioctl_cross_memory_copy_args) -#define AMDKFD_COMMAND_START 0x01 -#define AMDKFD_COMMAND_END 0x22 +#define AMDKFD_COMMAND_START_2 0x80 +#define AMDKFD_COMMAND_END_2 0x84 #endif