P4 to Git Change 1273440 by gandryey@gera-w8 on 2016/05/26 13:48:57

SWDEV-94161 - [Adobe Photoshop] TDR is observed while applying Blur effect on the selected portion of an Image
	- Restore back the original condition for SDMA restriction (CL#1195487). The root cause wasn't identified and probably somewhere in GSL, since PAL backend works fine.

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/GSLDevice.cpp#166 edit

rocclr/runtime/device/gpu/gslbe/src/rt/GSLDevice.cpp

@@ -1210,7 +1210,7 @@ CALGSLDevice::GetCopyType(
             // Make sure linear pitch in bytes is 4 bytes aligned
             if (((linearBytePitch % 4) == 0) &&
                 // another DRM restriciton... SI has 4 pixels
-                (destOffset[0] % 4 == 0))
+                (srcOffset[0] % 4 == 0))
             {
                 // The sDMA T2L cases we need to avoid are when the tiled_x
                 // is not a multiple of BytesPerPixel.
@@ -1231,7 +1231,7 @@ CALGSLDevice::GetCopyType(
             // Make sure linear pitch in bytes is 4 bytes aligned
             if (((linearBytePitch % 4) == 0) &&
                 // another DRM restriciton... SI has 4 pixels
-                (srcOffset[0] % 4 == 0))
+                (destOffset[0] % 4 == 0))
             {
                 // The sDMA L2T cases we need to avoid are when the tiled_x
                 // is not a multiple of BytesPerPixel.