From 16e02e529ceb5fa58223ef5df33f7269425cd19b Mon Sep 17 00:00:00 2001 From: foreman Date: Fri, 2 Oct 2015 18:43:51 -0400 Subject: [PATCH] P4 to Git Change 1196709 by gandryey@gera-w8 on 2015/10/02 18:27:00 SWDEV-77510 - cl_amd_topology doesn't return the correct bus id on a two socket system - replace cl_char with cl_uchar Affected files ... ... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/headers/opencl1.2/CL/cl_ext.h#10 edit ... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/headers/opencl2.0/CL/cl_ext.h#17 edit ... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/headers/opencl2.1/CL/cl_ext.h#3 edit --- opencl/api/opencl/khronos/headers/opencl1.2/CL/cl_ext.h | 2 +- opencl/api/opencl/khronos/headers/opencl2.0/CL/cl_ext.h | 2 +- opencl/api/opencl/khronos/headers/opencl2.1/CL/cl_ext.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/opencl/api/opencl/khronos/headers/opencl1.2/CL/cl_ext.h b/opencl/api/opencl/khronos/headers/opencl1.2/CL/cl_ext.h index d3568c4195..8d46a40c58 100644 --- a/opencl/api/opencl/khronos/headers/opencl1.2/CL/cl_ext.h +++ b/opencl/api/opencl/khronos/headers/opencl1.2/CL/cl_ext.h @@ -240,7 +240,7 @@ typedef CL_API_ENTRY cl_int (CL_API_CALL *clGetKernelSubGroupInfoKHR_fn)( typedef union { struct { cl_uint type; cl_uint data[5]; } raw; - struct { cl_uint type; cl_char unused[17]; cl_char bus; cl_char device; cl_char function; } pcie; + struct { cl_uint type; cl_uchar unused[17]; cl_uchar bus; cl_uchar device; cl_uchar function; } pcie; } cl_device_topology_amd; #define CL_DEVICE_TOPOLOGY_TYPE_PCIE_AMD 1 diff --git a/opencl/api/opencl/khronos/headers/opencl2.0/CL/cl_ext.h b/opencl/api/opencl/khronos/headers/opencl2.0/CL/cl_ext.h index 141fbfafc2..fbe756c8d6 100644 --- a/opencl/api/opencl/khronos/headers/opencl2.0/CL/cl_ext.h +++ b/opencl/api/opencl/khronos/headers/opencl2.0/CL/cl_ext.h @@ -205,7 +205,7 @@ typedef CL_API_ENTRY cl_int (CL_API_CALL *clTerminateContextKHR_fn)(cl_context / typedef union { struct { cl_uint type; cl_uint data[5]; } raw; - struct { cl_uint type; cl_char unused[17]; cl_char bus; cl_char device; cl_char function; } pcie; + struct { cl_uint type; cl_uchar unused[17]; cl_uchar bus; cl_uchar device; cl_uchar function; } pcie; } cl_device_topology_amd; #define CL_DEVICE_TOPOLOGY_TYPE_PCIE_AMD 1 diff --git a/opencl/api/opencl/khronos/headers/opencl2.1/CL/cl_ext.h b/opencl/api/opencl/khronos/headers/opencl2.1/CL/cl_ext.h index d67eb72734..139a22d002 100644 --- a/opencl/api/opencl/khronos/headers/opencl2.1/CL/cl_ext.h +++ b/opencl/api/opencl/khronos/headers/opencl2.1/CL/cl_ext.h @@ -204,7 +204,7 @@ typedef CL_API_ENTRY cl_int (CL_API_CALL *clTerminateContextKHR_fn)(cl_context / typedef union { struct { cl_uint type; cl_uint data[5]; } raw; - struct { cl_uint type; cl_char unused[17]; cl_char bus; cl_char device; cl_char function; } pcie; + struct { cl_uint type; cl_uchar unused[17]; cl_uchar bus; cl_uchar device; cl_uchar function; } pcie; } cl_device_topology_amd; #define CL_DEVICE_TOPOLOGY_TYPE_PCIE_AMD 1