GOSTSec
/
ccminer
mirror of https://github.com/GOSTSec/ccminer
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

nvml: fix possible mismatch of vendor names (x64) 

seen on a weird motherboard with a PCI Express Switch (MSI XPower Z87)

On this motherboard, the first/top device pci id is the highest one...
2upstream
Tanguy Pruvot 9 years ago
parent
55932ee6f0
commit
5fb84189b2
1 changed files with 4 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      nvml.cpp

7
nvml.cpp
Unescape View File

@ -935,7 +935,7 @@ int nvapi_init()
if (ret == NVAPI_OK && busId == device_bus_ids[g]) { if (ret == NVAPI_OK && busId == device_bus_ids[g]) {
nvapi_dev_map[g] = i; nvapi_dev_map[g] = i;
if (opt_debug) if (opt_debug)
applog(LOG_DEBUG, "CUDA GPU#%d matches NVAPI GPU %d by busId %u", applog(LOG_DEBUG, "CUDA GPU %d matches NVAPI GPU %d by busId %u",
g, i, busId); g, i, busId);
break; break;
} }
@ -1099,7 +1099,7 @@ static int translate_vendor_id(uint16_t vid, char *vendorname)
return vid; return vid;
} }
} }
if (opt_debug) if (opt_debug && vid != 0x10DE)
applog(LOG_DEBUG, "nvml: Unknown vendor %04x\n", vid); applog(LOG_DEBUG, "nvml: Unknown vendor %04x\n", vid);
return 0; return 0;
} }
@ -1154,7 +1154,8 @@ int gpu_vendor(uint8_t pci_bus_id, char *vendorname)
if (hnvml) { // may not be initialized on start... if (hnvml) { // may not be initialized on start...
for (int id=0; id < hnvml->nvml_gpucount; id++) { for (int id=0; id < hnvml->nvml_gpucount; id++) {
if (hnvml->nvml_pci_bus_id[id] == pci_bus_id) { if (hnvml->nvml_pci_bus_id[id] == pci_bus_id) {
nvml_get_info(hnvml, id, vid, pid); int dev_id = hnvml->nvml_cuda_device_id[id];
nvml_get_info(hnvml, dev_id, vid, pid);
} }
} }
} else { } else {

Write Preview
Loading…
Cancel
Save