From 2b6aa9bfac488c0b3f2253766d9dd120569c7e9c Mon Sep 17 00:00:00 2001 From: foreman Date: Thu, 21 Dec 2017 16:29:52 -0500 Subject: [PATCH] P4 to Git Change 1497507 by gandryey@gera-w8 on 2017/12/21 16:23:01 SWDEV-79445 - OCL generic changes and code clean-up - Don't add the offset, since it's already a part of VM address Affected files ... ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palresource.cpp#44 edit [ROCm/clr commit: 3768afb1055b0c412829403d67f7f88ae8768fb1] --- projects/clr/rocclr/runtime/device/pal/palresource.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/clr/rocclr/runtime/device/pal/palresource.cpp b/projects/clr/rocclr/runtime/device/pal/palresource.cpp index 5cae62145b..c13f5e6fb2 100644 --- a/projects/clr/rocclr/runtime/device/pal/palresource.cpp +++ b/projects/clr/rocclr/runtime/device/pal/palresource.cpp @@ -646,7 +646,7 @@ bool Resource::create(MemoryType memType, CreateParams* params) { return false; } Pal::BufferViewInfo viewInfo = {}; - viewInfo.gpuAddr = vmAddress() + offset(); + viewInfo.gpuAddr = vmAddress(); viewInfo.range = memRef_->iMem()->Desc().size; viewInfo.stride = elementSize(); viewInfo.swizzledFormat.format = format; @@ -760,7 +760,7 @@ bool Resource::create(MemoryType memType, CreateParams* params) { mapCount_++; } Pal::BufferViewInfo viewInfo = {}; - viewInfo.gpuAddr = vmAddress() + offset(); + viewInfo.gpuAddr = vmAddress(); viewInfo.range = memRef_->iMem()->Desc().size; viewInfo.stride = elementSize(); viewInfo.swizzledFormat.format = format; @@ -1058,7 +1058,7 @@ bool Resource::create(MemoryType memType, CreateParams* params) { desc_.cardMemory_ = false; if ((nullptr != params) && (nullptr != params->owner_) && (nullptr != params->owner_->getSvmPtr())) { - params->owner_->setSvmPtr(reinterpret_cast(vmAddress())); + params->owner_->setSvmPtr(reinterpret_cast(memRef_->iMem()->Desc().gpuVirtAddr)); } return true; }