GOSTSec/ccminer
1
0
Fork 0
mirror of https://github.com/GOSTSec/ccminer synced 2025-01-09 22:38:05 +00:00
Code Issues Releases Wiki Activity

nvml: use the right nvmlDeviceGetPciInfo_v2 api

Browse Source 
so... pciutils branch is no more required on windows :p
This commit is contained in:
Tanguy Pruvot 2015-06-23 14:36:32 +02:00
parent cad3772122
commit f73f5f6a2e
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ccminer.cpp
View File

@ -3231,6 +3231,7 @@ int main(int argc, char *argv[])
/* nvml is currently not the best choice on Windows (only in x64) */ /* nvml is currently not the best choice on Windows (only in x64) */
hnvml = nvml_create(); hnvml = nvml_create();
if (hnvml) { if (hnvml) {
cuda_devicenames(); // refresh gpu vendor name
applog(LOG_INFO, "NVML GPU monitoring enabled."); applog(LOG_INFO, "NVML GPU monitoring enabled.");
for (int n=0; n < opt_n_threads; n++) { for (int n=0; n < opt_n_threads; n++) {
if (nvml_set_clocks(hnvml, device_map[n]) == 1) if (nvml_set_clocks(hnvml, device_map[n]) == 1)

14
nvml.cpp
View File

@ -147,7 +147,7 @@ nvml_handle * nvml_create()
nvmlh->nvmlDeviceGetClockInfo = (nvmlReturn_t (*)(nvmlDevice_t, nvmlClockType_t, unsigned int *clock)) nvmlh->nvmlDeviceGetClockInfo = (nvmlReturn_t (*)(nvmlDevice_t, nvmlClockType_t, unsigned int *clock))
wrap_dlsym(nvmlh->nvml_dll, "nvmlDeviceGetClockInfo"); wrap_dlsym(nvmlh->nvml_dll, "nvmlDeviceGetClockInfo");
nvmlh->nvmlDeviceGetPciInfo = (nvmlReturn_t (*)(nvmlDevice_t, nvmlPciInfo_t *)) nvmlh->nvmlDeviceGetPciInfo = (nvmlReturn_t (*)(nvmlDevice_t, nvmlPciInfo_t *))
wrap_dlsym(nvmlh->nvml_dll, "nvmlDeviceGetPciInfo"); wrap_dlsym(nvmlh->nvml_dll, "nvmlDeviceGetPciInfo_v2");
nvmlh->nvmlDeviceGetName = (nvmlReturn_t (*)(nvmlDevice_t, char *, int)) nvmlh->nvmlDeviceGetName = (nvmlReturn_t (*)(nvmlDevice_t, char *, int))
wrap_dlsym(nvmlh->nvml_dll, "nvmlDeviceGetName"); wrap_dlsym(nvmlh->nvml_dll, "nvmlDeviceGetName");
nvmlh->nvmlDeviceGetTemperature = (nvmlReturn_t (*)(nvmlDevice_t, int, unsigned int *)) nvmlh->nvmlDeviceGetTemperature = (nvmlReturn_t (*)(nvmlDevice_t, int, unsigned int *))
@ -232,7 +232,7 @@ nvml_handle * nvml_create()
nvmlh->nvml_pci_domain_id[i] = pciinfo.domain; nvmlh->nvml_pci_domain_id[i] = pciinfo.domain;
nvmlh->nvml_pci_bus_id[i] = pciinfo.bus; nvmlh->nvml_pci_bus_id[i] = pciinfo.bus;
nvmlh->nvml_pci_device_id[i] = pciinfo.device; nvmlh->nvml_pci_device_id[i] = pciinfo.device;
nvmlh->nvml_pci_subsys_id[i] = pciinfo.pci_device_id; /* pci_subsystem_id broken (0xccccccccc) */ nvmlh->nvml_pci_subsys_id[i] = pciinfo.pci_subsystem_id;
nvmlh->app_clocks[i] = NVML_FEATURE_UNKNOWN; nvmlh->app_clocks[i] = NVML_FEATURE_UNKNOWN;
if (nvmlh->nvmlDeviceSetAPIRestriction) { if (nvmlh->nvmlDeviceSetAPIRestriction) {
@ -890,11 +890,6 @@ unsigned int gpu_power(struct cgpu_info *gpu)
static int translate_vendor_id(uint16_t vid, char *vendorname) static int translate_vendor_id(uint16_t vid, char *vendorname)
{ {
bool identified = false;
if (!vendorname)
return -EINVAL;
struct VENDORS { struct VENDORS {
const uint16_t vid; const uint16_t vid;
const char *name; const char *name;
@ -908,13 +903,16 @@ static int translate_vendor_id(uint16_t vid, char *vendorname)
{ 0, "" } { 0, "" }
}; };
if (!vendorname)
return -EINVAL;
for(int v=0; v < ARRAY_SIZE(vendors); v++) { for(int v=0; v < ARRAY_SIZE(vendors); v++) {
if (vid == vendors[v].vid) { if (vid == vendors[v].vid) {
strcpy(vendorname, vendors[v].name); strcpy(vendorname, vendors[v].name);
return vid; return vid;
} }
} }
if (!identified && opt_debug) if (opt_debug)
applog(LOG_DEBUG, "nvml: Unknown vendor %04x\n", vid); applog(LOG_DEBUG, "nvml: Unknown vendor %04x\n", vid);
return 0; return 0;
} }