mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-05 16:03:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

nvidia: Validate the nvidia_drm module options

Browse source 
When the proprietary nvidia driver is used, ensure the modeset option is
set instead of checking /proc/cmdline for nvidia-drm.modeset=1.
This commit is contained in:
Dan Robertson 2017-10-24 22:35:31 +00:00
parent 5551bf92a9
commit 88d042ec49
No known key found for this signature in database
GPG key ID: 45C4A652C47E42A5
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." "You need nvidia, nvidia_modeset, nvidia_uvm, and nvidia_drm."
"\x1B[0m\n"); "\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"); f = fopen("/proc/cmdline", "r");
if (f) { if (f) {
char *line = read_line(f); char *line = read_line(f);
@ -146,6 +169,7 @@ void detect_proprietary() {
fclose(f); fclose(f);
free(line); free(line);
} }
#endif
} }
} }