P4 to Git Change 1353702 by cpaquot@hog-ocl on 2016/12/15 14:43:42

SWDEV-108384 - Revert back CL 1352747

	ReviewBoardURL = http://ocltc.amd.com/reviews/r/12030/diff/

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocvirtual.cpp#26 edit


[ROCm/clr commit: fb0e417372]

projects/clr/rocclr/runtime/device/rocm/rocvirtual.cpp

@@ -1186,9 +1186,9 @@ void VirtualGPU::submitMapMemory(amd::MapMemoryCommand &cmd)
             }
             else {
                 result = blitMgr().readImage(
-                    *hsaMemory, const_cast<void*>(cmd.mapPtr()), cmd.origin(),
+                    *hsaMemory, hostPtr, amd::Coord3D(0),
-                    cmd.size(), image->getRowPitch(),
+                    image->getRegion(), image->getRowPitch(),
-                    image->getSlicePitch(), cmd.isEntireMemory());
+                    image->getSlicePitch(), true);
             }
         }
         else {
@@ -1242,10 +1242,12 @@ void VirtualGPU::submitUnmapMemory(amd::UnmapMemoryCommand &cmd)
                       mapInfo->origin_, mapInfo->region_, mapInfo->isEntire());
                 }
                 else {
+                    void *hostPtr = devMemory->owner()->getHostMem();
+
                     result = blitMgr().writeImage(
-                        cmd.mapPtr(), *devMemory,
+                        hostPtr, *devMemory,
-                        mapInfo->origin_, mapInfo->region_,
+                        amd::Coord3D(0), image->getRegion(),
-                        image->getRowPitch(), image->getSlicePitch(), mapInfo->isEntire());
+                        image->getRowPitch(), image->getSlicePitch(), true);
                 }
             }
             else {