P4 to Git Change 1071796 by xcui@merged_opencl_jxcwin on 2014/08/29 17:10:04

EPR #404341 - disable OPenCL 2.0 for corssfire and multipe devices temporaraly, this is the OPENCL  changes.
	code review:
	http://ocltc.amd.com/reviews/r/5639/

	precheckin testing results:
	http://ocltc.amd.com:8111/viewModification.html?modId=38513&personal=true&init=1&tab=vcsModificationBuilds

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudevice.cpp#458 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudevice.hpp#132 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpusettings.cpp#277 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/include/cal/cal.h#28 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/GSLDevice.cpp#98 edit

rocclr/runtime/device/gpu/gpusettings.cpp

@@ -287,6 +287,9 @@ Settings::create(
 #if defined(_LP64)
             oclVersion_ = reportAsOCL12Device ? OpenCL12 : XCONCAT(OpenCL,XCONCAT(OPENCL_MAJOR,OPENCL_MINOR));
 #endif
+            if (calAttr.numOfVpu > 1) {
+                oclVersion_ = OpenCL12;
+            }
             if (GPU_FORCE_OCL20_32BIT) {
                 force32BitOcl20_ = true;
                 oclVersion_ = reportAsOCL12Device ? OpenCL12 : XCONCAT(OpenCL,XCONCAT(OPENCL_MAJOR,OPENCL_MINOR));