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

Don't fail in the case the number of ADL and OpenCL devices do not match, and do not attempt to reorder devices unless they match.

Browse Source 
Instead give a warning about the likely cause and the potential consequence of it - Hardware monitoring may NOT match up with devices.
This commit is contained in:
Con Kolivas 2012-01-30 09:15:20 +11:00
parent f0746f0b4c
commit 891960389e
1 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
adl.c
View File

@ -116,6 +116,7 @@ void init_adl(int nDevs)
{ {
int result, i, j, devices = 0, last_adapter = -1, gpu = 0, dummy = 0; int result, i, j, devices = 0, last_adapter = -1, gpu = 0, dummy = 0;
struct gpu_adapters adapters[MAX_GPUDEVICES], vadapters[MAX_GPUDEVICES]; struct gpu_adapters adapters[MAX_GPUDEVICES], vadapters[MAX_GPUDEVICES];
bool devs_match = true;
#if defined (LINUX) #if defined (LINUX)
hDLL = dlopen( "libatiadlxx.so", RTLD_LAZY|RTLD_GLOBAL); hDLL = dlopen( "libatiadlxx.so", RTLD_LAZY|RTLD_GLOBAL);
@ -248,8 +249,11 @@ void init_adl(int nDevs)
* opencl enumerated devices and the ADL enumerated * opencl enumerated devices and the ADL enumerated
* ones, we have to assume they're in the same order.*/ * ones, we have to assume they're in the same order.*/
if (++devices > nDevs) { if (++devices > nDevs) {
applog(LOG_ERR, "ADL found more devices than opencl"); applog(LOG_ERR, "ADL found more devices than opencl!");
return; applog(LOG_ERR, "There is possibly at least one GPU that doesn't support OpenCL");
devs_match = false;
devices = nDevs;
break;
} }
last_adapter = lpAdapterID; last_adapter = lpAdapterID;
@ -259,24 +263,33 @@ void init_adl(int nDevs)
} }
} }
/* Windows has some kind of random ordering for bus number IDs and if (devs_match && devices == nDevs) {
* ordering the GPUs according to ascending order fixes it. Linux /* Windows has some kind of random ordering for bus number IDs and
* has usually sequential but decreasing order instead! */ * ordering the GPUs according to ascending order fixes it. Linux
for (i = 0; i < devices; i++) { * has usually sequential but decreasing order instead! */
int j, virtual_gpu = 0; for (i = 0; i < devices; i++) {
int j, virtual_gpu = 0;
for (j = 0; j < devices; j++) { for (j = 0; j < devices; j++) {
if (i == j) if (i == j)
continue; continue;
#ifdef WIN32 #ifdef WIN32
if (adapters[j].iBusNumber < adapters[i].iBusNumber) if (adapters[j].iBusNumber < adapters[i].iBusNumber)
#else #else
if (adapters[j].iBusNumber > adapters[i].iBusNumber) if (adapters[j].iBusNumber > adapters[i].iBusNumber)
#endif #endif
virtual_gpu++; virtual_gpu++;
}
vadapters[virtual_gpu].virtual_gpu = i;
vadapters[virtual_gpu].id = adapters[i].id;
} }
vadapters[virtual_gpu].virtual_gpu = i; } else {
vadapters[virtual_gpu].id = adapters[i].id; 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 (gpu = 0; gpu < devices; gpu++) { for (gpu = 0; gpu < devices; gpu++) {