diff --git a/projects/clr/rocclr/runtime/device/gpu/gpudevice.cpp b/projects/clr/rocclr/runtime/device/gpu/gpudevice.cpp index aa4cfd0f32..5d72bcf6e6 100644 --- a/projects/clr/rocclr/runtime/device/gpu/gpudevice.cpp +++ b/projects/clr/rocclr/runtime/device/gpu/gpudevice.cpp @@ -1800,7 +1800,6 @@ Device::bindExternalDevice( } return false; } - CloseInitializedAdapter(); } #ifdef _WIN32 @@ -1817,7 +1816,6 @@ Device::bindExternalDevice( LogError("Failed gslD3D10Associate()"); return false; } - CloseInitializedAdapter(); } if (flags & amd::Context::Flags::D3D11DeviceKhr) { @@ -1833,7 +1831,6 @@ Device::bindExternalDevice( LogError("Failed gslD3D11Associate()"); return false; } - CloseInitializedAdapter(); } if (flags & amd::Context::Flags::D3D9DeviceKhr) { @@ -1845,7 +1842,6 @@ Device::bindExternalDevice( LogWarning("D3D9<->OpenCL adapter mismatch or D3D9Associate() failure"); return false; } - CloseInitializedAdapter(); } if (flags & amd::Context::Flags::D3D9DeviceEXKhr) { @@ -1857,7 +1853,6 @@ Device::bindExternalDevice( LogWarning("D3D9<->OpenCL adapter mismatch or D3D9Associate() failure"); return false; } - CloseInitializedAdapter(); } if (flags & amd::Context::Flags::D3D9DeviceVAKhr) { diff --git a/projects/clr/rocclr/runtime/device/gpu/gslbe/src/rt/GSLDevice.cpp b/projects/clr/rocclr/runtime/device/gpu/gslbe/src/rt/GSLDevice.cpp index c3ffd2d8d7..68994f1492 100644 --- a/projects/clr/rocclr/runtime/device/gpu/gslbe/src/rt/GSLDevice.cpp +++ b/projects/clr/rocclr/runtime/device/gpu/gslbe/src/rt/GSLDevice.cpp @@ -44,7 +44,6 @@ void CALGSLDevice::Initialize() m_isComputeRingIDForced = false; m_forcedComputeEngineID = GSL_ENGINEID_INVALID; gslDeviceOps_ = NULL; - m_initLite = 0; } CALGSLDevice::CALGSLDevice() @@ -291,22 +290,7 @@ void CALGSLDevice::PerformAdapterInitialization() const { CALGSLDevice* mutable_this = const_cast(this); - // Win10 initialization is more exhaustive. - // @ToDo Check if Win7 can be simplified as well - mutable_this->PerformAdapterInitialization_int((bool)m_initLite); -} - -void CALGSLDevice::CloseInitializedAdapter() -{ - // @ToDo Check if Win7 can be simplified as well - if (m_initLite) - { - //! @note: GSL device isn't thread safe - amd::ScopedLock k(gslDeviceOps()); - // close the adaptor - gsAdaptor::closeAdaptor(m_adp); - m_adp = 0; - } + mutable_this->PerformAdapterInitialization_int(false); } void @@ -322,14 +306,15 @@ CALGSLDevice::PerformFullInitialization() const bool CALGSLDevice::SetupAdapter(int32 &asic_id) { + bool initLite = false; #ifdef ATI_OS_WIN if(osGetVersion() >= AMD_OS_VERSION_WINDOWS_10) { - m_initLite = 1; + initLite = true; } #endif - PerformAdapterInitialization_int((bool)m_initLite); + PerformAdapterInitialization_int(initLite); if (m_adp == 0) { diff --git a/projects/clr/rocclr/runtime/device/gpu/gslbe/src/rt/GSLDevice.h b/projects/clr/rocclr/runtime/device/gpu/gslbe/src/rt/GSLDevice.h index 533553e50d..64649c4e3c 100644 --- a/projects/clr/rocclr/runtime/device/gpu/gslbe/src/rt/GSLDevice.h +++ b/projects/clr/rocclr/runtime/device/gpu/gslbe/src/rt/GSLDevice.h @@ -102,7 +102,6 @@ public: void PerformAdapterInitialization() const; void PerformFullInitialization() const; - void CloseInitializedAdapter(); CopyType GetCopyType(gslMemObject srcMem, gslMemObject destMem, size_t* srcOffset, size_t* destOffset, bool allowDMA, uint32 flags, size_t size, bool enableCopyRect) const; @@ -208,7 +207,6 @@ private: uint m_PerformLazyDeviceInit : 1; uint m_isComputeRingIDForced : 1; uint m_isSDMAL2TConstrained : 1; - uint m_initLite : 1; }; };