P4 to Git Change 1392795 by wchau@wchau_OCL_boltzmann on 2017/03/30 14:32:40

SWDEV-79278 - [OpenCL][GFXIP9 Bring up] Add the Vega10 DeviceInfo entry and the gfx90X control functions.
	- modify getHsaDeviceId() to use HSA_AGENT_INFO_NAME to determine the HSA device ID.
	- add back the codes to get the pci_id in the function

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocdevice.cpp#46 edit


[ROCm/clr commit: 37f3408aef]

projects/clr/rocclr/runtime/device/rocm/rocdevice.cpp

@@ -55,6 +55,14 @@ const bool roc::NullDevice::offlineDevice_= true;
 
 
 static HsaDeviceId getHsaDeviceId(hsa_agent_t device, uint32_t& pci_id) {
+
+    if (HSA_STATUS_SUCCESS !=
+        hsa_agent_get_info(
+        device, (hsa_agent_info_t)HSA_AMD_AGENT_INFO_CHIP_ID,
+        &pci_id)) {
+        return HSA_INVALID_DEVICE_ID;
+    }
+
     char agent_name[64] = { 0 };
 
     if (HSA_STATUS_SUCCESS != hsa_agent_get_info(device, HSA_AGENT_INFO_NAME, agent_name)) {