P4 to Git Change 1250684 by gandryey@gera-w8 on 2016/03/23 17:59:05

SWDEV-86035 - Add PAL backend to OpenCL
	- Update PAL backend to match the latests PAL interfaces

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/pal/Makefile#2 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/build/Makefile.pal#2 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/build/Makefile#1 add
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/build/Makefile.palbe#1 add
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palblit.cpp#2 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldevice.cpp#2 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldevice.hpp#2 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palkernel.cpp#2 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palkernel.hpp#2 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palprogram.cpp#2 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palprogram.hpp#2 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palvirtual.cpp#2 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palvirtual.hpp#2 edit

rocclr/runtime/device/pal/palblit.cpp

@@ -937,6 +937,8 @@ KernelBlitManager::copyBufferToImage(
     static const bool CopyRect = false;
     // Flush DMA for ASYNC copy
     static const bool FlushDMA = true;
+    size_t imgRowPitch = size[0] * gpuMem(dstMemory).elementSize();
+    size_t imgSlicePitch = imgRowPitch * size[1];
 
     if (setup_.disableCopyBufferToImage_) {
         result = DmaBlitManager::copyBufferToImage(
@@ -947,7 +949,9 @@ KernelBlitManager::copyBufferToImage(
     }
     // Check if buffer is in system memory with direct access
     else if (gpuMem(srcMemory).isHostMemDirectAccess() &&
-             (rowPitch == 0) && (slicePitch == 0)) {
+             (((rowPitch == 0) && (slicePitch == 0)) ||
+              ((rowPitch == imgRowPitch) &&
+               ((slicePitch == 0) || (slicePitch == imgSlicePitch))))) {
         // First attempt to do this all with DMA,
         // but there are restriciton with older hardware
         if (dev().settings().imageDMA_) {
@@ -1327,6 +1331,8 @@ KernelBlitManager::copyImageToBuffer(
     static const bool CopyRect = false;
     // Flush DMA for ASYNC copy
     static const bool FlushDMA = true;
+    size_t imgRowPitch = size[0] * gpuMem(srcMemory).elementSize();
+    size_t imgSlicePitch = imgRowPitch * size[1];
 
     if (setup_.disableCopyImageToBuffer_) {
         result = HostBlitManager::copyImageToBuffer(
@@ -1337,7 +1343,9 @@ KernelBlitManager::copyImageToBuffer(
     }
     // Check if buffer is in system memory with direct access
     else if (gpuMem(dstMemory).isHostMemDirectAccess() &&
-             (rowPitch == 0) && (slicePitch == 0)) {
+             (((rowPitch == 0) && (slicePitch == 0)) ||
+              ((rowPitch == imgRowPitch) &&
+                ((slicePitch == 0) || (slicePitch == imgSlicePitch))))) {
         // First attempt to do this all with DMA,
         // but there are restriciton with older hardware
         if (dev().settings().imageDMA_) {