marcel/gamemode
1
0
Fork 0
mirror of https://github.com/FeralInteractive/gamemode.git synced 2025-06-07 08:07:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Try and make an educated guess at the correct nvidia gpu index

Browse Source 
This should hopefully fix issue #113, where the user was in the common situation of having an intel and an nvidia GPU, at card0 and card1 respectively, but the nvidia gpu was [gpu:0] according to the driver
This commit is contained in:
Marc Di Luzio 2019-03-11 21:35:53 +00:00
parent 0c08359005
commit c1d06f2ad5
1 changed files with 23 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
daemon/gpuclockctl.c
View File

@ -67,44 +67,36 @@ static void print_usage_and_exit(void)
/* Get the nvidia driver index for the current GPU */ /* Get the nvidia driver index for the current GPU */
static long get_gpu_index_id_nv(struct GameModeGPUInfo *info) static long get_gpu_index_id_nv(struct GameModeGPUInfo *info)
{ {
// Default to using the current device number
long gpu_index = info->device;
if (info->vendor != Vendor_NVIDIA) if (info->vendor != Vendor_NVIDIA)
return -1; return -1;
if (!getenv("DISPLAY")) /* NOTE: This is currently based off of a best guess of how the NVidia gpu index works
LOG_ERROR("Getting Nvidia parameters requires DISPLAY to be set - will likely fail!\n"); * ie. that the index is simply the index into available NV gpus in the same order as drm
long current = 0; * If that is not the case then this may fail to discern the correct GPU
do { */
char arg[128] = { 0 };
char buf[EXTERNAL_BUFFER_MAX] = { 0 };
char *end;
/* Get the PCI id parameter */ int device = 0;
snprintf(arg, 128, NV_ATTRIBUTE_FORMAT, current, NV_PCIDEVICE_ATTRIBUTE); int nv_device = -1;
const char *exec_args_core[] = { "/usr/bin/nvidia-settings", "-q", arg, "-t", NULL }; while (device <= info->device) {
if (run_external_process(exec_args_core, buf, -1) != 0) { /* Get the vendor for each gpu sequentially */
LOG_ERROR("Failed to get %s! Will be defaulting to nvidia gpu index %ld\n", enum GPUVendor vendor = gamemode_get_gpu_vendor(device++);
arg,
gpu_index); switch (vendor) {
/* Failure just means we've overrun the device list */ case Vendor_NVIDIA:
/* If we've found an nvidia device, increment our counter */
nv_device++;
break;
case Vendor_Invalid:
/* Bail out, we've gone too far */
LOG_ERROR("Failed to find Nvidia GPU with expected index!\n");
break;
default:
/* Non-NV gpu, continue */
break; break;
} }
};
long pcidevice = strtol(buf, &end, 10); return nv_device;
if (end == buf) {
LOG_ERROR("Failed to parse output for \"%s\" output was \"%s\"!\n", arg, buf);
break;
}
if (info->device == pcidevice) {
gpu_index = current;
break;
}
} while (true);
return gpu_index;
} }
/* Get the max nvidia perf level */ /* Get the max nvidia perf level */