Commit 94059c06f421d75141005fb742ad3c7b19778fae
2012-01-30T21:07:16
Ensure all virtual_gpu entries are set when the number of ADL devices does not match the number of OpenCL devices.
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 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77
diff --git a/adl.c b/adl.c
index c7ed42d..e2e4eb4 100644
--- a/adl.c
+++ b/adl.c
@@ -264,43 +264,44 @@ void init_adl(int nDevs)
}
}
- if (devs_match && devices == nDevs) {
+ if (devices < nDevs) {
+ applog(LOG_ERR, "ADL found less devices than opencl!");
+ applog(LOG_ERR, "There is possibly more than one display attached to a GPU");
+ devs_match = false;
+ }
+
+ for (i = 0; i < nDevs; i++) {
+ vadapters[i].virtual_gpu = i;
+ vadapters[i].id = adapters[i].id;
+ }
+
+ if (!devs_match) {
+ applog(LOG_ERR, "WARNING: Number of OpenCL and ADL devices does not match!");
+ applog(LOG_ERR, "Hardware monitoring may NOT match up with devices!");
+ } else if (opt_reorder) {
/* Windows has some kind of random ordering for bus number IDs and
* ordering the GPUs according to ascending order fixes it. Linux
* has usually sequential but decreasing order instead! */
for (i = 0; i < devices; i++) {
int j, virtual_gpu;
- if (opt_reorder) {
- virtual_gpu = 0;
- for (j = 0; j < devices; j++) {
- if (i == j)
- continue;
+ virtual_gpu = 0;
+ for (j = 0; j < devices; j++) {
+ if (i == j)
+ continue;
#ifdef WIN32
- if (adapters[j].iBusNumber < adapters[i].iBusNumber)
+ if (adapters[j].iBusNumber < adapters[i].iBusNumber)
#else
- if (adapters[j].iBusNumber > adapters[i].iBusNumber)
+ if (adapters[j].iBusNumber > adapters[i].iBusNumber)
#endif
- virtual_gpu++;
- }
- if (virtual_gpu != i)
- applog(LOG_INFO, "Mapping device %d to GPU %d according to Bus Number order",
- i, virtual_gpu);
- } else
- virtual_gpu = i;
- vadapters[virtual_gpu].virtual_gpu = i;
- vadapters[virtual_gpu].id = adapters[i].id;
- }
- } else {
- if (devices < nDevs) {
- applog(LOG_ERR, "ADL found less devices than opencl!");
- applog(LOG_ERR, "There is possibly more than one display attached to a GPU");
- }
- applog(LOG_ERR, "WARNING: Number of OpenCL and ADL devices does not match!");
- applog(LOG_ERR, "Hardware monitoring may NOT match up with devices!");
- for (i = 0; i < devices; i++) {
- vadapters[i].virtual_gpu = i;
- vadapters[i].id = adapters[i].id;
+ virtual_gpu++;
+ }
+ if (virtual_gpu != i) {
+ applog(LOG_INFO, "Mapping device %d to GPU %d according to Bus Number order",
+ i, virtual_gpu);
+ vadapters[virtual_gpu].virtual_gpu = i;
+ vadapters[virtual_gpu].id = adapters[i].id;
+ }
}
}