Commit 933627e73b7dbbfb5c91d1af4df5510d1ae6d768
2012-08-20T10:34:25
Reinstate fix ADL gpu-map not working when there are more ADL devices than openCL patch by Nite69. Add virtual adl mapping for when none is specified on the command line to not crash without a map specified.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50
diff --git a/adl.c b/adl.c
index aa22002..7f12ecd 100644
--- a/adl.c
+++ b/adl.c
@@ -306,9 +306,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!");
@@ -347,11 +348,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);
@@ -361,11 +363,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;
}