From d599b915240e52b73d2dc2857963a7745848b80e Mon Sep 17 00:00:00 2001 From: foreman Date: Wed, 19 Nov 2014 10:30:26 -0500 Subject: [PATCH] P4 to Git Change 1098567 by rili@rili_opencl_stg on 2014/11/19 10:20:42 EPR #407215 - re-submit CL#1098846 Added checking for VM Affected files ... ... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudevice.cpp#483 edit [ROCm/clr commit: 42627826ff4e7337e7c5af3bd0edf515b7114210] --- projects/clr/rocclr/runtime/device/gpu/gpudevice.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/projects/clr/rocclr/runtime/device/gpu/gpudevice.cpp b/projects/clr/rocclr/runtime/device/gpu/gpudevice.cpp index 9bed8fadd8..4fcf5b4f22 100644 --- a/projects/clr/rocclr/runtime/device/gpu/gpudevice.cpp +++ b/projects/clr/rocclr/runtime/device/gpu/gpudevice.cpp @@ -1693,7 +1693,11 @@ Device::createImage(amd::Memory& owner, bool directAccess) const return NULL; } // Create a view on the specified device - return (gpu::Memory*)createView(owner, *devParent); + gpuImage = (gpu::Memory*)createView(owner, *devParent); + if (heap()->isVirtual() && (NULL != gpuImage) && (gpuImage->owner() != NULL)) { + gpuImage->owner()->setHostMem((address)(owner.parent()->getHostMem()) + gpuImage->owner()->getOrigin()); + } + return gpuImage ; } gpuImage = new gpu::Image(*this, owner,