From 868a9fe9a5c62e34e9126b400dc2f49cb37b3a5c Mon Sep 17 00:00:00 2001 From: David Belanger Date: Tue, 24 Jan 2023 11:35:31 -0500 Subject: [PATCH] Revert "libhsakmt: Disabled allocation of CWSR with SVM for GFX11." This reverts commit 1ba59d64e1a15b9c8f0b30c5e331fa86cab1807a. Change-Id: I05bf82266f563c63c0b794a24b0926e7652ce42d Signed-off-by: David Belanger [ROCm/ROCR-Runtime commit: 0eb0bae38b535c6fd048b9e82cdfbac39a3a3d44] --- projects/rocr-runtime/src/libhsakmt.h | 2 -- projects/rocr-runtime/src/queues.c | 2 -- 2 files changed, 4 deletions(-) diff --git a/projects/rocr-runtime/src/libhsakmt.h b/projects/rocr-runtime/src/libhsakmt.h index 0f80e5eb3b..55fc5a465d 100644 --- a/projects/rocr-runtime/src/libhsakmt.h +++ b/projects/rocr-runtime/src/libhsakmt.h @@ -116,8 +116,6 @@ extern int hsakmt_debug_level; #define HSA_GET_GFX_VERSION_MINOR(gfxv) (((gfxv) / 100) % 100) #define HSA_GET_GFX_VERSION_STEP(gfxv) ((gfxv) % 100) -#define HSA_GET_GFX_VERSION_MAJOR_HEX(gfxv) (((gfxv) >> 16) & 0xff) - /* Expects HSA_ENGINE_ID.ui32, returns gfxv (full) in hex */ #define HSA_GET_GFX_VERSION_FULL(ui32) \ (((ui32.Major) << 16) | ((ui32.Minor) << 8) | (ui32.Stepping)) diff --git a/projects/rocr-runtime/src/queues.c b/projects/rocr-runtime/src/queues.c index c53d219c75..f59c3da7bf 100644 --- a/projects/rocr-runtime/src/queues.c +++ b/projects/rocr-runtime/src/queues.c @@ -512,8 +512,6 @@ static int handle_concrete_asic(struct queue *q, if (hsaKmtGetNodeProperties(NodeId, &node)) svm_api = false; - else if (HSA_GET_GFX_VERSION_MAJOR_HEX(q->gfxv) == 11) - svm_api = false; else svm_api = node.Capability.ui32.SVMAPISupported;