From 61ea4c66e1fdb0b99bf2a3ed4a7621adb81744da Mon Sep 17 00:00:00 2001 From: Philip Yang Date: Wed, 29 May 2024 18:00:21 -0400 Subject: [PATCH] libhsakmt: Update contiguous memory support ioctl version KFD ioctl version is 1.16 on upstream for contiguous memory support. Remove pc_sampling version, should be added after pc_sample upstream. Change-Id: I6e6c3340bc8e371d68dd7741b02578be2fdef801 Signed-off-by: Philip Yang Signed-off-by: Chris Freehill [ROCm/ROCR-Runtime commit: 6e6f445f75d68c5b7bb614068210294b5e848c72] --- .../rocr-runtime/libhsakmt/include/hsakmt/linux/kfd_ioctl.h | 3 +-- projects/rocr-runtime/libhsakmt/src/memory.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/projects/rocr-runtime/libhsakmt/include/hsakmt/linux/kfd_ioctl.h b/projects/rocr-runtime/libhsakmt/include/hsakmt/linux/kfd_ioctl.h index eba057917d..0c04283759 100644 --- a/projects/rocr-runtime/libhsakmt/include/hsakmt/linux/kfd_ioctl.h +++ b/projects/rocr-runtime/libhsakmt/include/hsakmt/linux/kfd_ioctl.h @@ -42,10 +42,9 @@ * - 1.14 - Update kfd_event_data * - 1.15 - Enable managing mappings in compute VMs with GEM_VA ioctl * - 1.16 - Add contiguous VRAM allocation flag - * - 1.17 - Add PC Sampling ioctl */ #define KFD_IOCTL_MAJOR_VERSION 1 -#define KFD_IOCTL_MINOR_VERSION 17 +#define KFD_IOCTL_MINOR_VERSION 16 struct kfd_ioctl_get_version_args { __u32 major_version; /* from KFD */ diff --git a/projects/rocr-runtime/libhsakmt/src/memory.c b/projects/rocr-runtime/libhsakmt/src/memory.c index 2ee2e9e3dc..cc6a0041ac 100644 --- a/projects/rocr-runtime/libhsakmt/src/memory.c +++ b/projects/rocr-runtime/libhsakmt/src/memory.c @@ -127,7 +127,7 @@ HSAKMT_STATUS HSAKMTAPI hsaKmtAllocMemoryAlign(HSAuint32 PreferredNode, CHECK_KFD_OPEN(); if (MemFlags.ui32.Contiguous) - CHECK_KFD_MINOR_VERSION(17); + CHECK_KFD_MINOR_VERSION(16); pr_debug("[%s] node %d\n", __func__, PreferredNode);