alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1430 from dlrobertson/nvidia_drm

Browse source 
nvidia: Validate the nvidia_drm module options
This commit is contained in:
Drew DeVault 2017-10-24 20:29:06 -04:00 committed by GitHub
parent 5551bf92a9 88d042ec49
commit d75ee3f9ce
1 changed files with 24 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
sway/main.c
View file

@ -135,6 +135,29 @@ void detect_proprietary() {
"You need nvidia, nvidia_modeset, nvidia_uvm, and nvidia_drm."
"\x1B[0m\n");
}
#ifdef __linux__
f = fopen("/sys/module/nvidia_drm/parameters/modeset", "r");
if (f) {
char *line = read_line(f);
if (line && strstr(line, "Y")) {
// nvidia-drm.modeset is set to 0
fprintf(stderr, "\x1B[1;31mWarning: You must load "
"nvidia-drm with the modeset option on to use "
"the proprietary driver. Consider adding "
"nvidia-drm.modeset=1 to your kernel command line "
"parameters.\x1B[0m\n");
}
fclose(f);
free(line);
} else {
// nvidia-drm.modeset is not set
fprintf(stderr, "\x1B[1;31mWarning: You must load "
"nvidia-drm with the modeset option on to use "
"the proprietary driver. Consider adding "
"nvidia-drm.modeset=1 to your kernel command line "
"parameters.\x1B[0m\n");
}
#else
f = fopen("/proc/cmdline", "r");
if (f) {
char *line = read_line(f);
@ -146,6 +169,7 @@ void detect_proprietary() {
fclose(f);
free(line);
}
#endif
}
}