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: 3768afb105]

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<void*>(vmAddress()));
+      params->owner_->setSvmPtr(reinterpret_cast<void*>(memRef_->iMem()->Desc().gpuVirtAddr));
     }
     return true;
   }