From 2018829660fa85f40d02593a4399ef0f036db2b2 Mon Sep 17 00:00:00 2001 From: Jonathan Kim Date: Thu, 9 Jun 2022 13:41:31 -0400 Subject: [PATCH] libhsakmt: permit runtime enable version for new hw mode set restrictions The KFD no longer allow debug ops that modify HW state prior to trap activation so permit bump in major version. Signed-off-by: Jonathan Kim Change-Id: I072d3998b7b043df9a67f0f6762b0afdfa9382c6 [ROCm/ROCR-Runtime commit: 79cd63fab6096990b4ddafdaa1ab12be56f2d228] --- projects/rocr-runtime/src/debug.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/projects/rocr-runtime/src/debug.c b/projects/rocr-runtime/src/debug.c index 2703722919..a7cd6a9c76 100644 --- a/projects/rocr-runtime/src/debug.c +++ b/projects/rocr-runtime/src/debug.c @@ -297,6 +297,7 @@ hsaKmtGetKernelDebugTrapVersionInfo( } #define HSA_RUNTIME_ENABLE_MIN_MAJOR 10 +#define HSA_RUNTIME_ENABLE_MAX_MAJOR 11 #define HSA_RUNTIME_ENABLE_MIN_MINOR 0 HSAKMT_STATUS HSAKMTAPI hsaKmtRuntimeEnable(void *rDebug, bool setupTtmp) @@ -310,8 +311,9 @@ HSAKMT_STATUS HSAKMTAPI hsaKmtRuntimeEnable(void *rDebug, if (result) return HSAKMT_STATUS_NOT_SUPPORTED; - if (kMajor != HSA_RUNTIME_ENABLE_MIN_MAJOR || - (int)kMinor < HSA_RUNTIME_ENABLE_MIN_MINOR) + if (kMajor < HSA_RUNTIME_ENABLE_MIN_MAJOR || kMajor > HSA_RUNTIME_ENABLE_MAX_MAJOR || + (kMajor == HSA_RUNTIME_ENABLE_MIN_MAJOR && + (int)kMinor < HSA_RUNTIME_ENABLE_MIN_MINOR)) return HSAKMT_STATUS_NOT_SUPPORTED; memset(&args, 0x00, sizeof(args));