mirror of
https://github.com/FeralInteractive/gamemode.git
synced 2025-06-07 16:17:23 +02:00
Automatically adjust the nvidia gpu index
The drm device ID doesn't match up with the pci device as expected, spotted by issue #113 I can't test this myself just yet, will need data from the user in question to verify PCIDevice is the right value
This commit is contained in:
parent
fec32ac53d
commit
dc1258d750
@ -41,6 +41,7 @@ POSSIBILITY OF SUCH DAMAGE.
|
|||||||
#define NV_MEM_OFFSET_ATTRIBUTE "GPUMemoryTransferRateOffset"
|
#define NV_MEM_OFFSET_ATTRIBUTE "GPUMemoryTransferRateOffset"
|
||||||
#define NV_POWERMIZER_MODE_ATTRIBUTE "GPUPowerMizerMode"
|
#define NV_POWERMIZER_MODE_ATTRIBUTE "GPUPowerMizerMode"
|
||||||
#define NV_PERFMODES_ATTRIBUTE "GPUPerfModes"
|
#define NV_PERFMODES_ATTRIBUTE "GPUPerfModes"
|
||||||
|
#define NV_PCIDEVICE_ATTRIBUTE "PCIDevice"
|
||||||
#define NV_ATTRIBUTE_FORMAT "[gpu:%ld]/%s"
|
#define NV_ATTRIBUTE_FORMAT "[gpu:%ld]/%s"
|
||||||
#define NV_PERF_LEVEL_FORMAT "[%ld]"
|
#define NV_PERF_LEVEL_FORMAT "[%ld]"
|
||||||
|
|
||||||
@ -63,6 +64,49 @@ static void print_usage_and_exit(void)
|
|||||||
exit(EXIT_FAILURE);
|
exit(EXIT_FAILURE);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Get the nvidia driver index for the current GPU */
|
||||||
|
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)
|
||||||
|
return -1;
|
||||||
|
|
||||||
|
if (!getenv("DISPLAY"))
|
||||||
|
LOG_ERROR("Getting Nvidia parameters requires DISPLAY to be set - will likely fail!\n");
|
||||||
|
long current = 0;
|
||||||
|
do {
|
||||||
|
char arg[128] = { 0 };
|
||||||
|
char buf[EXTERNAL_BUFFER_MAX] = { 0 };
|
||||||
|
char *end;
|
||||||
|
|
||||||
|
/* Get the PCI id parameter */
|
||||||
|
snprintf(arg, 128, NV_ATTRIBUTE_FORMAT, current, NV_PCIDEVICE_ATTRIBUTE);
|
||||||
|
const char *exec_args_core[] = { "/usr/bin/nvidia-settings", "-q", arg, "-t", NULL };
|
||||||
|
if (run_external_process(exec_args_core, buf, -1) != 0) {
|
||||||
|
LOG_ERROR("Failed to get %s! Will be defaulting to nvidia gpu index %ld\n",
|
||||||
|
arg,
|
||||||
|
gpu_index);
|
||||||
|
/* Failure just means we've overrun the device list */
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
long pcidevice = strtol(buf, &end, 10);
|
||||||
|
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 */
|
||||||
static long get_max_perf_level_nv(struct GameModeGPUInfo *info)
|
static long get_max_perf_level_nv(struct GameModeGPUInfo *info)
|
||||||
{
|
{
|
||||||
@ -361,9 +405,14 @@ int main(int argc, char *argv[])
|
|||||||
info.device = get_device(argv[1]);
|
info.device = get_device(argv[1]);
|
||||||
info.vendor = gamemode_get_gpu_vendor(info.device);
|
info.vendor = gamemode_get_gpu_vendor(info.device);
|
||||||
|
|
||||||
|
/* Adjust the device number to the gpu index for Nvidia */
|
||||||
|
if (info.vendor == Vendor_NVIDIA)
|
||||||
|
info.device = get_gpu_index_id_nv(&info);
|
||||||
|
|
||||||
/* Fetch the state and print it out */
|
/* Fetch the state and print it out */
|
||||||
switch (info.vendor) {
|
switch (info.vendor) {
|
||||||
case Vendor_NVIDIA:
|
case Vendor_NVIDIA:
|
||||||
|
|
||||||
if (get_gpu_state_nv(&info) != 0)
|
if (get_gpu_state_nv(&info) != 0)
|
||||||
exit(EXIT_FAILURE);
|
exit(EXIT_FAILURE);
|
||||||
printf("%ld %ld %ld\n", info.nv_core, info.nv_mem, info.nv_powermizer_mode);
|
printf("%ld %ld %ld\n", info.nv_core, info.nv_mem, info.nv_powermizer_mode);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user