From 5451d80ccb75c930d19ec9956b928171035f7e1c Mon Sep 17 00:00:00 2001 From: foreman Date: Mon, 6 Oct 2014 17:58:11 -0400 Subject: [PATCH] P4 to Git Change 1084677 by xcui@merged_opencl_jxcwin on 2014/10/06 17:48:09 EPR #406328 - made more changes so that the OpenCL can run 2.0 devices on the first 2.0 capable device and OpenCL 1.2 on the rest of devices if they can suppport. Also uncommented an assert accidently commted by the previous check in. this is the OpenCL part of checkin. Prechecking: http://ocltc.amd.com:8111/viewModification.html?modId=40944&personal=true&buildTypeId=&tab=vcsModificationBuilds&show_all_builds=true code review: http://ocltc.amd.com/reviews/r/5987/ Affected files ... ... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_svm.cpp#6 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpusettings.cpp#288 edit ... //depot/stg/opencl/drivers/opencl/runtime/platform/context.cpp#31 edit --- opencl/api/opencl/amdocl/cl_svm.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/opencl/api/opencl/amdocl/cl_svm.cpp b/opencl/api/opencl/amdocl/cl_svm.cpp index 728b548b18..cca509d980 100644 --- a/opencl/api/opencl/amdocl/cl_svm.cpp +++ b/opencl/api/opencl/amdocl/cl_svm.cpp @@ -142,6 +142,9 @@ RUNTIME_ENTRY_RET_NOERRCODE(void*, clSVMAlloc, ( for (it = devices.begin(); it != devices.end(); ++it) { cl_device_svm_capabilities svmCapabilities = (*it)->info().svmCapabilities_; + if (svmCapabilities == 0) { + continue; + } combinedSvmCapabilities |= svmCapabilities; if (((*it)->info().maxMemAllocSize_ >= size) ||