Commit 78d60193305237edc4c9e5ef57a21506fd7429aa
2012-08-15T11:49:23
Revert "Fix ADL gpu-map not working when there are more ADL devices than openCL. Patch supplied and tested by Nite69." This reverts commit 2a474fe914524b20e0108396ab9bb873fba820ad. Broken.
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
diff --git a/adl.c b/adl.c
index 3b01714..cd977f2 100644
--- a/adl.c
+++ b/adl.c
@@ -339,17 +339,16 @@ void init_adl(int nDevs)
}
}
- for (gpu = 0; gpu < nDevs; gpu++) {
+ for (gpu = 0; gpu < devices; gpu++) {
struct gpu_adl *ga;
int iAdapterIndex;
int lpAdapterID;
ADLODPerformanceLevels *lpOdPerformanceLevels;
- int lev, adlGpu;
+ int lev;
- adlGpu = gpus[gpu].virtual_adl;
- i = vadapters[adlGpu].id;
+ i = vadapters[gpu].id;
iAdapterIndex = lpInfo[i].iAdapterIndex;
- gpus[gpu].virtual_gpu = vadapters[adlGpu].virtual_gpu;
+ gpus[gpu].virtual_gpu = vadapters[gpu].virtual_gpu;
/* Get unique identifier of the adapter, 0 means not AMD */
result = ADL_Adapter_ID_Get(iAdapterIndex, &lpAdapterID);
@@ -359,11 +358,11 @@ void init_adl(int nDevs)
}
if (gpus[gpu].deven == DEV_DISABLED) {
- gpus[gpu].gpu_engine =
- gpus[gpu].gpu_memclock =
- gpus[gpu].gpu_vddc =
- gpus[gpu].gpu_fan =
- gpus[gpu].gpu_powertune = 0;
+ gpus[i].gpu_engine =
+ gpus[i].gpu_memclock =
+ gpus[i].gpu_vddc =
+ gpus[i].gpu_fan =
+ gpus[i].gpu_powertune = 0;
continue;
}