From b016d1e09c861c89ef975fe8af3ac14bd95e7e03 Mon Sep 17 00:00:00 2001
From: Longlong Yao <Longlong.Yao@amd.com>
Date: Wed, 19 Mar 2025 16:56:29 +0800
Subject: [PATCH] libhsakmt: filter AMD asics before QueryAdapterInfo

Signed-off-by: Flora Cui <flora.cui@amd.com>
Signed-off-by: Longlong Yao <Longlong.Yao@amd.com>
Reviewed-by: lyndonli <Lyndon.Li@amd.com>
Part-of: <http://10.67.69.192/wsl/rocr-runtime/-/merge_requests/45>
---
 wddm/device.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/wddm/device.cpp b/wddm/device.cpp
index 0a0de0f7d9..9b32914fd5 100644
--- a/wddm/device.cpp
+++ b/wddm/device.cpp
@@ -814,9 +814,12 @@ NTSTATUS WDDMGetAdapters(D3DKMT_ADAPTERINFO *&adapters, int &num_adapters)
     if (ret != STATUS_SUCCESS)
       goto err_out1;
 
+    if (!std::wcsstr(query.ChipType, L"AMD"))
+      continue;
+
     supported = thunk_proxy::QueryAdapterSupported(info[i].hAdapter);
 
-    if (std::wcsstr(query.ChipType, L"AMD") && supported) {
+    if (supported) {
       adapters[num_adapters++] = info[i];
     }
   }