P4 to Git Change 1208618 by skudchad@skudchad_test_win_opencl2 on 2015/11/06 17:27:01

SWDEV-77172 - IOMMUv2 changes for Windows 10
	- Clear passing SVM flag from top level and fix GL interop on SVM
	- Add\Remove gpuvmOffset before WDDM calls as its added manually for SUA model

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

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuresource.cpp#230 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/GSLDeviceGL.cpp#25 edit


[ROCm/clr commit: b0b6b55051]

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

@@ -691,10 +691,8 @@ Resource::create(MemoryType memType, CreateParams* params)
         resData.GLdeviceContext = oglRes->glDeviceContext_;
         resData.name = oglRes->handle_;
         resData.type = glType_;
-
-        if(dev().settings().svmFineGrainSystem_) {
-            resData.flags = GL_INTEROP_SVM;
-        }
+        // We need not pass any flags down to OGL for interop and there is no need to
+        // pass down resData.flags field
 
         if (dev().resGLAssociate(resData)) {
             gslResource = resData.memObject;

projects/clr/rocclr/runtime/device/gpu/gslbe/src/rt/GSLDeviceGL.cpp

@@ -685,11 +685,6 @@ CALGSLDevice::resGLAssociate(GLResAssociate & resData) const
         GSL_ALLOCATION_INSTANCED // alloc_type
     );
 
-    if (m_adp->pAsicInfo->svmFineGrainSystem)
-    {
-        attribs.isAllocSVM = true;
-    }
-
     hRes.type = resData.type;
 
     GLResourceData* hData = new GLResourceData;