From beb46a0a30424612b4b554e215132b1b079728dc Mon Sep 17 00:00:00 2001 From: foreman Date: Tue, 29 May 2018 18:13:40 -0400 Subject: [PATCH] P4 to Git Change 1561216 by gandryey@gera-w8 on 2018/05/29 18:05:31 SWDEV-79445 - OCL generic changes and code clean-up - Remove parent_ field from the device object, since it was used for subdevices only. Affected files ... ... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_device.cpp#72 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/device.cpp#219 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/device.hpp#304 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudevice.cpp#590 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldevice.cpp#91 edit ... //depot/stg/opencl/drivers/opencl/runtime/platform/context.cpp#52 edit ... //depot/stg/opencl/drivers/opencl/runtime/platform/program.cpp#94 edit ... //depot/stg/opencl/drivers/opencl/runtime/platform/program.hpp#45 edit [ROCm/clr commit: 0680df2550cfb03e48bb9ae331345fad935e5f37] --- projects/clr/opencl/api/opencl/amdocl/cl_device.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/projects/clr/opencl/api/opencl/amdocl/cl_device.cpp b/projects/clr/opencl/api/opencl/amdocl/cl_device.cpp index 9a8d7c3351..a9f3d7a50e 100644 --- a/projects/clr/opencl/api/opencl/amdocl/cl_device.cpp +++ b/projects/clr/opencl/api/opencl/amdocl/cl_device.cpp @@ -340,8 +340,7 @@ RUNTIME_ENTRY(cl_int, clGetDeviceInfo, CASE(CL_DEVICE_IMAGE_MAX_BUFFER_SIZE, imageMaxBufferSize_); CASE(CL_DEVICE_IMAGE_MAX_ARRAY_SIZE, imageMaxArraySize_); case CL_DEVICE_PARENT_DEVICE: { - cl_device_id parent = - !as_amd(device)->isRootDevice() ? as_cl(as_amd(device)->parent()) : (cl_device_id)0; + cl_device_id parent = (cl_device_id)0; return amd::clGetInfo(parent, param_value_size, param_value, param_value_size_ret); } CASE(CL_DEVICE_PARTITION_MAX_SUB_DEVICES, maxComputeUnits_);