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

gpuclockctl: refactor buffer size specification and avoid redundancies

Browse Source
This commit is contained in:
Matthias Gerstner 2019-04-03 16:46:38 +02:00
parent d7394cbeb2
commit b411cfff6b
1 changed files with 64 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

116
daemon/gpuclockctl.c
View File

@ -36,6 +36,8 @@ POSSIBILITY OF SUCH DAMAGE.
#include "external-helper.h" #include "external-helper.h"
#include "gpu-control.h" #include "gpu-control.h"
#include <limits.h>
/* NV constants */ /* NV constants */
#define NV_CORE_OFFSET_ATTRIBUTE "GPUGraphicsClockOffset" #define NV_CORE_OFFSET_ATTRIBUTE "GPUGraphicsClockOffset"
#define NV_MEM_OFFSET_ATTRIBUTE "GPUMemoryTransferRateOffset" #define NV_MEM_OFFSET_ATTRIBUTE "GPUMemoryTransferRateOffset"
@ -44,6 +46,7 @@ POSSIBILITY OF SUCH DAMAGE.
#define NV_PCIDEVICE_ATTRIBUTE "PCIDevice" #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]"
#define NV_ARG_MAX 128
/* AMD constants */ /* AMD constants */
#define AMD_DRM_PATH "/sys/class/drm/card%ld/device/%s" #define AMD_DRM_PATH "/sys/class/drm/card%ld/device/%s"
@ -64,6 +67,30 @@ static void print_usage_and_exit(void)
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
static const char* get_nv_attr(const char *attr)
{
static char out[EXTERNAL_BUFFER_MAX];
const char *exec_args[] = { "/usr/bin/nvidia-settings", "-q", attr, "-t", NULL };
if (run_external_process(exec_args, out, -1) != 0) {
LOG_ERROR("Failed to get %s!\n", attr);
out[0] = 0;
return NULL;
}
return &out[0];
}
static int set_nv_attr(const char *attr)
{
const char *exec_args_core[] = { "/usr/bin/nvidia-settings", "-a", attr, NULL };
if (run_external_process(exec_args_core, NULL, -1) != 0) {
LOG_ERROR("Failed to set %s!\n", attr);
return -1;
}
return 0;
}
/* 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)
{ {
@ -108,23 +135,21 @@ static long get_max_perf_level_nv(struct GameModeGPUInfo *info)
if (!getenv("DISPLAY")) if (!getenv("DISPLAY"))
LOG_ERROR("Getting Nvidia parameters requires DISPLAY to be set - will likely fail!\n"); LOG_ERROR("Getting Nvidia parameters requires DISPLAY to be set - will likely fail!\n");
char arg[128] = { 0 }; char arg[NV_ARG_MAX] = { 0 };
char buf[EXTERNAL_BUFFER_MAX] = { 0 }; const char *attr;
snprintf(arg, 128, NV_ATTRIBUTE_FORMAT, info->device, NV_PERFMODES_ATTRIBUTE); snprintf(arg, NV_ARG_MAX, NV_ATTRIBUTE_FORMAT, info->device, NV_PERFMODES_ATTRIBUTE);
const char *exec_args[] = { "/usr/bin/nvidia-settings", "-q", arg, "-t", NULL }; if ((attr = get_nv_attr(arg)) == NULL) {
if (run_external_process(exec_args, buf, -1) != 0) {
LOG_ERROR("Failed to get %s!\n", arg);
return -1; return -1;
} }
char *ptr = strrchr(buf, ';'); char *ptr = strrchr(attr, ';');
long level = -1; long level = -1;
if (!ptr || sscanf(ptr, "; perf=%ld", &level) != 1) { if (!ptr || sscanf(ptr, "; perf=%ld", &level) != 1) {
LOG_ERROR( LOG_ERROR(
"Output didn't match expected format, couldn't discern highest perf level from " "Output didn't match expected format, couldn't discern highest perf level from "
"nvidia-settings!\n"); "nvidia-settings!\n");
LOG_ERROR("Output:%s\n", buf); LOG_ERROR("Output:%s\n", attr);
return -1; return -1;
} }
@ -142,59 +167,53 @@ static int get_gpu_state_nv(struct GameModeGPUInfo *info)
long perf_level = get_max_perf_level_nv(info); long perf_level = get_max_perf_level_nv(info);
char arg[128] = { 0 }; char arg[NV_ARG_MAX] = { 0 };
char buf[EXTERNAL_BUFFER_MAX] = { 0 }; const char *attr;
char *end; char *end;
/* Get the GPUGraphicsClockOffset parameter */ /* Get the GPUGraphicsClockOffset parameter */
snprintf(arg, snprintf(arg,
128, NV_ARG_MAX,
NV_ATTRIBUTE_FORMAT NV_PERF_LEVEL_FORMAT, NV_ATTRIBUTE_FORMAT NV_PERF_LEVEL_FORMAT,
info->device, info->device,
NV_CORE_OFFSET_ATTRIBUTE, NV_CORE_OFFSET_ATTRIBUTE,
perf_level); perf_level);
const char *exec_args_core[] = { "/usr/bin/nvidia-settings", "-q", arg, "-t", NULL }; if ((attr = get_nv_attr(arg)) == NULL) {
if (run_external_process(exec_args_core, buf, -1) != 0) {
LOG_ERROR("Failed to get %s!\n", arg);
return -1; return -1;
} }
info->nv_core = strtol(buf, &end, 10); info->nv_core = strtol(attr, &end, 10);
if (end == buf) { if (end == attr) {
LOG_ERROR("Failed to parse output for \"%s\" output was \"%s\"!\n", arg, buf); LOG_ERROR("Failed to parse output for \"%s\" output was \"%s\"!\n", arg, attr);
return -1; return -1;
} }
/* Get the GPUMemoryTransferRateOffset parameter */ /* Get the GPUMemoryTransferRateOffset parameter */
snprintf(arg, snprintf(arg,
128, NV_ARG_MAX,
NV_ATTRIBUTE_FORMAT NV_PERF_LEVEL_FORMAT, NV_ATTRIBUTE_FORMAT NV_PERF_LEVEL_FORMAT,
info->device, info->device,
NV_MEM_OFFSET_ATTRIBUTE, NV_MEM_OFFSET_ATTRIBUTE,
perf_level); perf_level);
const char *exec_args_mem[] = { "/usr/bin/nvidia-settings", "-q", arg, "-t", NULL }; if ((attr = get_nv_attr(arg)) == NULL) {
if (run_external_process(exec_args_mem, buf, -1) != 0) {
LOG_ERROR("Failed to get %s!\n", arg);
return -1; return -1;
} }
info->nv_mem = strtol(buf, &end, 10); info->nv_mem = strtol(attr, &end, 10);
if (end == buf) { if (end == attr) {
LOG_ERROR("Failed to parse output for \"%s\" output was \"%s\"!\n", arg, buf); LOG_ERROR("Failed to parse output for \"%s\" output was \"%s\"!\n", arg, attr);
return -1; return -1;
} }
/* Get the GPUPowerMizerMode parameter */ /* Get the GPUPowerMizerMode parameter */
snprintf(arg, 128, NV_ATTRIBUTE_FORMAT, info->device, NV_POWERMIZER_MODE_ATTRIBUTE); snprintf(arg, NV_ARG_MAX, NV_ATTRIBUTE_FORMAT, info->device, NV_POWERMIZER_MODE_ATTRIBUTE);
const char *exec_args_pm[] = { "/usr/bin/nvidia-settings", "-q", arg, "-t", NULL }; if ((attr = get_nv_attr(arg)) == NULL) {
if (run_external_process(exec_args_pm, buf, -1) != 0) {
LOG_ERROR("Failed to get %s!\n", arg);
return -1; return -1;
} }
info->nv_powermizer_mode = strtol(buf, &end, 10); info->nv_powermizer_mode = strtol(attr, &end, 10);
if (end == buf) { if (end == attr) {
LOG_ERROR("Failed to parse output for \"%s\" output was \"%s\"!\n", arg, buf); LOG_ERROR("Failed to parse output for \"%s\" output was \"%s\"!\n", arg, attr);
return -1; return -1;
} }
@ -218,20 +237,18 @@ static int set_gpu_state_nv(struct GameModeGPUInfo *info)
long perf_level = get_max_perf_level_nv(info); long perf_level = get_max_perf_level_nv(info);
char arg[128] = { 0 }; char arg[NV_ARG_MAX] = { 0 };
/* Set the GPUGraphicsClockOffset parameter */ /* Set the GPUGraphicsClockOffset parameter */
if (info->nv_core != -1) { if (info->nv_core != -1) {
snprintf(arg, snprintf(arg,
128, NV_ARG_MAX,
NV_ATTRIBUTE_FORMAT NV_PERF_LEVEL_FORMAT "=%ld", NV_ATTRIBUTE_FORMAT NV_PERF_LEVEL_FORMAT "=%ld",
info->device, info->device,
NV_CORE_OFFSET_ATTRIBUTE, NV_CORE_OFFSET_ATTRIBUTE,
perf_level, perf_level,
info->nv_core); info->nv_core);
const char *exec_args_core[] = { "/usr/bin/nvidia-settings", "-a", arg, NULL }; if (set_nv_attr(arg) != 0) {
if (run_external_process(exec_args_core, NULL, -1) != 0) {
LOG_ERROR("Failed to set %s!\n", arg);
status = -1; status = -1;
} }
} }
@ -239,15 +256,13 @@ static int set_gpu_state_nv(struct GameModeGPUInfo *info)
/* Set the GPUMemoryTransferRateOffset parameter */ /* Set the GPUMemoryTransferRateOffset parameter */
if (info->nv_mem != -1) { if (info->nv_mem != -1) {
snprintf(arg, snprintf(arg,
128, NV_ARG_MAX,
NV_ATTRIBUTE_FORMAT NV_PERF_LEVEL_FORMAT "=%ld", NV_ATTRIBUTE_FORMAT NV_PERF_LEVEL_FORMAT "=%ld",
info->device, info->device,
NV_MEM_OFFSET_ATTRIBUTE, NV_MEM_OFFSET_ATTRIBUTE,
perf_level, perf_level,
info->nv_mem); info->nv_mem);
const char *exec_args_mem[] = { "/usr/bin/nvidia-settings", "-a", arg, NULL }; if (set_nv_attr(arg) != 0) {
if (run_external_process(exec_args_mem, NULL, -1) != 0) {
LOG_ERROR("Failed to set %s!\n", arg);
status = -1; status = -1;
} }
} }
@ -255,14 +270,12 @@ static int set_gpu_state_nv(struct GameModeGPUInfo *info)
/* Set the GPUPowerMizerMode parameter if requested */ /* Set the GPUPowerMizerMode parameter if requested */
if (info->nv_powermizer_mode != -1) { if (info->nv_powermizer_mode != -1) {
snprintf(arg, snprintf(arg,
128, NV_ARG_MAX,
NV_ATTRIBUTE_FORMAT "=%ld", NV_ATTRIBUTE_FORMAT "=%ld",
info->device, info->device,
NV_POWERMIZER_MODE_ATTRIBUTE, NV_POWERMIZER_MODE_ATTRIBUTE,
info->nv_powermizer_mode); info->nv_powermizer_mode);
const char *exec_args_pm[] = { "/usr/bin/nvidia-settings", "-a", arg, NULL }; if (set_nv_attr(arg) != 0) {
if (run_external_process(exec_args_pm, NULL, -1) != 0) {
LOG_ERROR("Failed to set %s!\n", arg);
status = -1; status = -1;
} }
} }
@ -280,8 +293,8 @@ static int get_gpu_state_amd(struct GameModeGPUInfo *info)
return -1; return -1;
/* Get the contents of power_dpm_force_performance_level */ /* Get the contents of power_dpm_force_performance_level */
char path[64]; char path[PATH_MAX];
snprintf(path, 64, AMD_DRM_PATH, info->device, "power_dpm_force_performance_level"); snprintf(path, PATH_MAX, AMD_DRM_PATH, info->device, "power_dpm_force_performance_level");
FILE *file = fopen(path, "r"); FILE *file = fopen(path, "r");
if (!file) { if (!file) {
@ -317,8 +330,8 @@ static int get_gpu_state_amd(struct GameModeGPUInfo *info)
*/ */
static int set_gpu_state_amd_file(const char *filename, long device, const char *value) static int set_gpu_state_amd_file(const char *filename, long device, const char *value)
{ {
char path[64]; char path[PATH_MAX];
snprintf(path, 64, AMD_DRM_PATH, device, filename); snprintf(path, PATH_MAX, AMD_DRM_PATH, device, filename);
FILE *file = fopen(path, "w"); FILE *file = fopen(path, "w");
if (!file) { if (!file) {
@ -398,10 +411,11 @@ static long get_generic_value(const char *val)
*/ */
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
if (argc == 3 && strncmp(argv[2], "get", 3) == 0) {
/* Get and verify the vendor and device */
struct GameModeGPUInfo info; struct GameModeGPUInfo info;
memset(&info, 0, sizeof(info)); memset(&info, 0, sizeof(info));
if (argc == 3 && strncmp(argv[2], "get", 3) == 0) {
/* Get and verify the vendor and device */
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);
@ -428,8 +442,6 @@ int main(int argc, char *argv[])
} else if (argc >= 4 && argc <= 7 && strncmp(argv[2], "set", 3) == 0) { } else if (argc >= 4 && argc <= 7 && strncmp(argv[2], "set", 3) == 0) {
/* Get and verify the vendor and device */ /* Get and verify the vendor and device */
struct GameModeGPUInfo info;
memset(&info, 0, sizeof(info));
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);