GOSTSec/sgminer
1
0
Fork 0
mirror of https://github.com/GOSTSec/sgminer synced 2025-01-10 23:08:07 +00:00
Code Issues Releases Wiki Activity

Ensure all virtual_gpu entries are set when the number of ADL devices does not match the number of OpenCL devices.

Browse Source
This commit is contained in:
Con Kolivas 2012-01-30 21:07:16 +11:00
parent b3d1378e34
commit 94059c06f4
1 changed files with 29 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
adl.c
View File

@ -264,14 +264,27 @@ 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 /* Windows has some kind of random ordering for bus number IDs and
* ordering the GPUs according to ascending order fixes it. Linux * ordering the GPUs according to ascending order fixes it. Linux
* has usually sequential but decreasing order instead! */ * has usually sequential but decreasing order instead! */
for (i = 0; i < devices; i++) { for (i = 0; i < devices; i++) {
int j, virtual_gpu; int j, virtual_gpu;
if (opt_reorder) {
virtual_gpu = 0; virtual_gpu = 0;
for (j = 0; j < devices; j++) { for (j = 0; j < devices; j++) {
if (i == j) if (i == j)
@ -283,24 +296,12 @@ void init_adl(int nDevs)
#endif #endif
virtual_gpu++; virtual_gpu++;
} }
if (virtual_gpu != i) if (virtual_gpu != i) {
applog(LOG_INFO, "Mapping device %d to GPU %d according to Bus Number order", applog(LOG_INFO, "Mapping device %d to GPU %d according to Bus Number order",
i, virtual_gpu); i, virtual_gpu);
} else
virtual_gpu = i;
vadapters[virtual_gpu].virtual_gpu = i; vadapters[virtual_gpu].virtual_gpu = i;
vadapters[virtual_gpu].id = adapters[i].id; 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;
} }
} }