From e8ca936563ae2ea813fa4bace1867d803bf3581e Mon Sep 17 00:00:00 2001
From: Jason Tang <jason.tang@amd.com>
Date: Tue, 25 May 2021 17:45:06 -0400
Subject: [PATCH] SWDEV-287332 - Disable NullDevice in HIP

Change-Id: I45c6010d2a3fcd0576438e3c72fbed78dff09b6b


[ROCm/clr commit: 7932b5a562012184788fba972148a620903adea1]
---
 projects/clr/rocclr/device/device.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/projects/clr/rocclr/device/device.cpp b/projects/clr/rocclr/device/device.cpp
index b60e1df167..82d55b44e8 100644
--- a/projects/clr/rocclr/device/device.cpp
+++ b/projects/clr/rocclr/device/device.cpp
@@ -397,7 +397,9 @@ bool Device::init() {
       // abort();
       DevLogError("KFD is not installed \n");
     }
-    ret |= roc::NullDevice::init();
+    if (!amd::IS_HIP) {
+      ret |= roc::NullDevice::init();
+    }
   }
 #endif  // WITH_HSA_DEVICE
 #if defined(WITH_GPU_DEVICE)