Merge 'master' into 'amd-master'

Change-Id: Ife0db35b29ac732ba661499de009ada0456df724

hipamd/src/hip_memory.cpp

@@ -1589,7 +1589,7 @@ hipError_t ihipMemset(void* dst, int  value, size_t sizeBytes, hipStream_t strea
     return e;
 };
 
-hipError_t getLockedPointer(const void *hostPtr, size_t dataLen, void **devicePtrPtr)
+hipError_t getLockedPointer(void *hostPtr, size_t dataLen, void **devicePtrPtr)
 {
         hc::accelerator acc;
 
@@ -1600,7 +1600,8 @@ hipError_t getLockedPointer(const void *hostPtr, size_t dataLen, void **devicePt
 #endif
         am_status_t status = hc::am_memtracker_getinfo(&amPointerInfo, hostPtr);
         if (status == AM_SUCCESS) {
-            *devicePtrPtr =  (char*)amPointerInfo._devicePointer;
+            *devicePtrPtr = static_cast<char*>(amPointerInfo._devicePointer) +
+                (static_cast<char*>(hostPtr) - static_cast<char*>(amPointerInfo._hostPointer));
             return(hipSuccess);
         };
         return(hipErrorHostMemoryNotRegistered);