P4 to Git Change 1310033 by skudchad@skudchad_test_win_opencl2 on 2016/09/01 18:10:18

SWDEV-101383 - [RS_DVR][MGPU] Slave GPU is blocked from going into BACO when DVR process is active (no recording or instant replay)
	- if the OS is Win10, no need to do extensive adapter init.

	ReviewBoardURL = http://ocltc.amd.com/reviews/r/11241/diff/

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudevice.cpp#552 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/GSLDevice.cpp#171 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/GSLDevice.h#60 edit


[ROCm/clr commit: b232b2bbab]

projects/clr/rocclr/runtime/device/gpu/gpudevice.cpp

@@ -1800,6 +1800,7 @@ Device::bindExternalDevice(
             }
             return false;
         }
+        CloseInitializedAdapter();
     }
 
 #ifdef _WIN32
@@ -1816,6 +1817,7 @@ Device::bindExternalDevice(
             LogError("Failed gslD3D10Associate()");
             return false;
         }
+        CloseInitializedAdapter();
     }
 
     if (flags & amd::Context::Flags::D3D11DeviceKhr) {
@@ -1831,6 +1833,7 @@ Device::bindExternalDevice(
             LogError("Failed gslD3D11Associate()");
             return false;
         }
+        CloseInitializedAdapter();
     }
 
     if (flags & amd::Context::Flags::D3D9DeviceKhr) {
@@ -1842,6 +1845,7 @@ Device::bindExternalDevice(
             LogWarning("D3D9<->OpenCL adapter mismatch or D3D9Associate() failure");
             return false;
         }
+        CloseInitializedAdapter();
     }
 
     if (flags & amd::Context::Flags::D3D9DeviceEXKhr) {
@@ -1853,6 +1857,7 @@ Device::bindExternalDevice(
             LogWarning("D3D9<->OpenCL adapter mismatch or D3D9Associate() failure");
             return false;
         }
+        CloseInitializedAdapter();
     }
 
     if (flags & amd::Context::Flags::D3D9DeviceVAKhr) {