P4 to Git Change 1258240 by gandryey@gera-ocl on 2016/04/14 19:21:55

SWDEV-79445 - OCL generic changes and code clean-up
	- Fix TC failures. Clean unmap info after runtime gets the mip

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuvirtual.cpp#400 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palvirtual.cpp#5 edit


[ROCm/clr commit: 511fd5a36a]

projects/clr/rocclr/runtime/device/gpu/gpuvirtual.cpp

@@ -1190,12 +1190,13 @@ VirtualGPU::submitUnmapMemory(amd::UnmapMemoryCommand& vcmd)
     amd::Image* amdImage = owner->asImage();
     if ((amdImage != NULL) && (amdImage->getMipLevels() > 1) &&
         (writeMapInfo->baseMip_ != NULL)) {
-        // Clear unmap flags from the parent image
-        memory->clearUnmapInfo(vcmd.mapPtr());
         // Assign mip level view
         amdImage = writeMapInfo->baseMip_;
+        // Clear unmap flags from the parent image
+        memory->clearUnmapInfo(vcmd.mapPtr());
         memory = dev().getGpuMemory(amdImage);
         unmapMip = true;
+        writeMapInfo = memory->writeMapInfo(vcmd.mapPtr());
     }
 
     // We used host memory

projects/clr/rocclr/runtime/device/pal/palvirtual.cpp

@@ -1433,12 +1433,13 @@ VirtualGPU::submitUnmapMemory(amd::UnmapMemoryCommand& vcmd)
     amd::Image* amdImage = owner->asImage();
     if ((amdImage != nullptr) && (amdImage->getMipLevels() > 1) &&
         (writeMapInfo->baseMip_ != nullptr)) {
-        // Clear unmap flags from the parent image
-        memory->clearUnmapInfo(vcmd.mapPtr());
         // Assign mip level view
         amdImage = writeMapInfo->baseMip_;
+        // Clear unmap flags from the parent image
+        memory->clearUnmapInfo(vcmd.mapPtr());
         memory = dev().getGpuMemory(amdImage);
         unmapMip = true;
+        writeMapInfo = memory->writeMapInfo(vcmd.mapPtr());
     }
 
     // We used host memory