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/gslbe/src/include/cal/cal.h

@@ -237,6 +237,7 @@ typedef struct CALdeviceattribsRec {
     CALuint64  vaStart;                             /**< VA start address */
     CALuint64  vaEnd;                               /**< VA end address */
     bool       isWorkstation;                       /**< Whether Device is a Workstation/Server part */
+    CALuint    numOfVpu;                            /**< number of vpu in the device*/
 } CALdeviceattribs;
 
 /** CAL device status */

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

@@ -154,6 +154,7 @@ CALGSLDevice::getAttribs_int(gsl::gsCtx* cs)
 
     m_attribs.vaStart = static_cast<CALuint64>(m_adp->pAsicInfo->vaStart);
     m_attribs.vaEnd   = static_cast<CALuint64>(m_adp->pAsicInfo->vaEnd);
+    m_attribs.numOfVpu = m_adp->pAsicInfo->numberOfVPU;
 }
 
 void