From 1ba573af2280aab73a952919375ed5bdfef30df0 Mon Sep 17 00:00:00 2001 From: foreman Date: Fri, 6 Nov 2015 17:35:18 -0500 Subject: [PATCH] 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: b0b6b55051e9bed97ee5166f4d62ba33c86ae785] --- projects/clr/rocclr/runtime/device/gpu/gpuresource.cpp | 6 ++---- .../rocclr/runtime/device/gpu/gslbe/src/rt/GSLDeviceGL.cpp | 5 ----- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/projects/clr/rocclr/runtime/device/gpu/gpuresource.cpp b/projects/clr/rocclr/runtime/device/gpu/gpuresource.cpp index 69c66387c0..b9b47eef54 100644 --- a/projects/clr/rocclr/runtime/device/gpu/gpuresource.cpp +++ b/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; diff --git a/projects/clr/rocclr/runtime/device/gpu/gslbe/src/rt/GSLDeviceGL.cpp b/projects/clr/rocclr/runtime/device/gpu/gslbe/src/rt/GSLDeviceGL.cpp index 884f4a99fe..ef8b14070e 100644 --- a/projects/clr/rocclr/runtime/device/gpu/gslbe/src/rt/GSLDeviceGL.cpp +++ b/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;