P4 to Git Change 1257129 by weizhang@weizhang-lnx-opencl on 2016/04/12 15:33:15

SWDEV-78299 - Re-submit CL#1236441.

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudevice.cpp#545 edit

rocclr/runtime/device/gpu/gpudevice.cpp

@@ -355,9 +355,15 @@ void NullDevice::fillDeviceInfo(
     // should be the size we can actually allocate at application
     // start.  Note that it may not be a guarantee still as the
     // application progresses.
+#if defined(BRAHMA) && defined(ATI_BITS_64)
+    info_.maxMemAllocSize_ = std::max(
+        cl_ulong(memInfo.cardMemAvailableBytes),
+        cl_ulong(memInfo.cardExtMemAvailableBytes));
+#else
     info_.maxMemAllocSize_ = std::max(
         cl_ulong(memInfo.cardLargestFreeBlockBytes),
         cl_ulong(memInfo.cardExtLargestFreeBlockBytes));
+#endif
 
     if (settings().apuSystem_) {
         info_.maxMemAllocSize_ = std::max(