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

Remove passing the vendor to gpuclockctl

Browse Source
This commit is contained in:
Marc Di Luzio
2019-03-10 14:11:22 +00:00
parent 5e5cae31d3
commit 873d0a224b
5 changed files with 113 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
daemon/gamemode-gpu.c
View File

@ -47,8 +47,6 @@ POSSIBILITY OF SUCH DAMAGE.
*/
int game_mode_initialise_gpu(GameModeConfig *config, GameModeGPUInfo **info)
{
int status = 0;
/* Verify input, this is programmer error */
if (!info || *info)
FATAL_ERROR("Invalid GameModeGPUInfo passed to %s", __func__);
@ -83,33 +81,9 @@ int game_mode_initialise_gpu(GameModeConfig *config, GameModeGPUInfo **info)
}
/* Fill in GPU vendor */
char path[64] = { 0 };
if (snprintf(path, 64, "/sys/class/drm/card%ld/device/vendor", new_info->device) < 0) {
LOG_ERROR("snprintf failed, will not apply gpu optimisations!\n");
return -1;
}
FILE *vendor = fopen(path, "r");
if (!vendor) {
LOG_ERROR("Couldn't open vendor file at %s, will not apply gpu optimisations!\n", path);
return -1;
}
char buff[64];
if (fgets(buff, 64, vendor) != NULL) {
new_info->vendor = strtol(buff, NULL, 0);
} else {
LOG_ERROR("Coudn't read contents of file %s, will not apply optimisations!\n", path);
return -1;
}
/* verify GPU vendor */
new_info->vendor = gamemode_get_gpu_vendor(new_info->device);
if (!GPUVendorValid(new_info->vendor)) {
LOG_ERROR("Unknown vendor value (0x%04x) found, cannot apply optimisations!\n",
(unsigned int)new_info->vendor);
LOG_ERROR("Known values are: 0x%04x (NVIDIA) 0x%04x (AMD) 0x%04x (Intel)\n",
Vendor_NVIDIA,
Vendor_AMD,
Vendor_Intel);
free(new_info);
LOG_ERROR("Found invalid vendor, will not apply optimisations!\n");
return -1;
}
@ -168,7 +142,7 @@ int game_mode_initialise_gpu(GameModeConfig *config, GameModeGPUInfo **info)
/* Give back the new gpu info */
*info = new_info;
return status;
return 0;
}
/* Simply used to free the GPU info object */
@ -196,8 +170,6 @@ int game_mode_apply_gpu(const GameModeGPUInfo *info)
LOG_MSG("Requesting GPU optimisations on device:%ld\n", info->device);
/* Generate the input strings */
char vendor[7];
snprintf(vendor, 7, "0x%04x", (short)info->vendor);
char device[4];
snprintf(device, 4, "%ld", info->device);
@ -214,7 +186,6 @@ int game_mode_apply_gpu(const GameModeGPUInfo *info)
const char *const exec_args[] = {
"/usr/bin/pkexec",
LIBEXECDIR "/gpuclockctl",
vendor,
device,
"set",
info->vendor == Vendor_NVIDIA ? nv_core : info->amd_performance_level,
@ -238,8 +209,6 @@ int game_mode_get_gpu(GameModeGPUInfo *info)
return 0;
/* Generate the input strings */
char vendor[7];
snprintf(vendor, 7, "0x%04x", (short)info->vendor);
char device[4];
snprintf(device, 4, "%ld", info->device);
char nv_perf_level[4];
@ -249,7 +218,6 @@ int game_mode_get_gpu(GameModeGPUInfo *info)
// This doesn't need pkexec as get does not need elevated perms
const char *const exec_args[] = {
LIBEXECDIR "/gpuclockctl",
vendor,
device,
"get",
info->vendor == Vendor_NVIDIA ? nv_perf_level : NULL, /* Only use this if Nvidia */