|
|
@@ -310,9 +310,10 @@ void init_adl(int nDevs)
|
|
|
if (gpus[i].mapped) {
|
|
|
vadapters[gpus[i].virtual_adl].virtual_gpu = i;
|
|
|
applog(LOG_INFO, "Mapping OpenCL device %d to ADL device %d", i, gpus[i].virtual_adl);
|
|
|
- }
|
|
|
+ } else
|
|
|
+ gpus[i].virtual_adl = i;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
if (!devs_match) {
|
|
|
applog(LOG_ERR, "WARNING: Number of OpenCL and ADL devices did not match!");
|
|
|
applog(LOG_ERR, "Hardware monitoring may NOT match up with devices!");
|
|
|
@@ -351,11 +352,12 @@ void init_adl(int nDevs)
|
|
|
int iAdapterIndex;
|
|
|
int lpAdapterID;
|
|
|
ADLODPerformanceLevels *lpOdPerformanceLevels;
|
|
|
- int lev;
|
|
|
+ int lev, adlGpu;
|
|
|
|
|
|
- i = vadapters[gpu].id;
|
|
|
+ adlGpu = gpus[gpu].virtual_adl;
|
|
|
+ i = vadapters[adlGpu].id;
|
|
|
iAdapterIndex = lpInfo[i].iAdapterIndex;
|
|
|
- gpus[gpu].virtual_gpu = vadapters[gpu].virtual_gpu;
|
|
|
+ gpus[gpu].virtual_gpu = vadapters[adlGpu].virtual_gpu;
|
|
|
|
|
|
/* Get unique identifier of the adapter, 0 means not AMD */
|
|
|
result = ADL_Adapter_ID_Get(iAdapterIndex, &lpAdapterID);
|
|
|
@@ -365,11 +367,11 @@ void init_adl(int nDevs)
|
|
|
}
|
|
|
|
|
|
if (gpus[gpu].deven == DEV_DISABLED) {
|
|
|
- gpus[i].gpu_engine =
|
|
|
- gpus[i].gpu_memclock =
|
|
|
- gpus[i].gpu_vddc =
|
|
|
- gpus[i].gpu_fan =
|
|
|
- gpus[i].gpu_powertune = 0;
|
|
|
+ gpus[gpu].gpu_engine =
|
|
|
+ gpus[gpu].gpu_memclock =
|
|
|
+ gpus[gpu].gpu_vddc =
|
|
|
+ gpus[gpu].gpu_fan =
|
|
|
+ gpus[gpu].gpu_powertune = 0;
|
|
|
continue;
|
|
|
}
|
|
|
|