P4 to Git Change 1311210 by chui@chui-cnchuiw8-ocl-hsa-stg on 2016/09/06 11:53:29

SWDEV-101383 - Back out CL1310033 as it is causing Carrizo Win 10 Sanity test to crash at ocltst module ocldx.

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudevice.cpp#553 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/GSLDevice.cpp#172 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/GSLDevice.h#61 edit

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) {