diff options
Diffstat (limited to 'sway')
| -rw-r--r-- | sway/main.c | 40 | ||||
| -rw-r--r-- | sway/sway.1.txt | 3 |
2 files changed, 35 insertions, 8 deletions
diff --git a/sway/main.c b/sway/main.c index b9f8936f..39bf225e 100644 --- a/sway/main.c +++ b/sway/main.c @@ -57,25 +57,55 @@ void detect_proprietary() { if (!f) { return; } + bool nvidia = false, nvidia_modeset = false, nvidia_uvm = false, nvidia_drm = false; while (!feof(f)) { char *line; if (!(line = read_line(f))) { break; } if (strstr(line, "nvidia")) { - fprintf(stderr, "\x1B[1;31mWarning: Proprietary nvidia drivers do NOT support Wayland. Use nouveau.\x1B[0m\n"); - fprintf(stderr, "\x1B[1;31mYes, they STILL don't work with the newly announced wayland \"support\".\x1B[0m\n"); - free(line); - break; + nvidia = true; + } + if (strstr(line, "nvidia_modeset")) { + nvidia_modeset = true; + } + if (strstr(line, "nvidia_uvm")) { + nvidia_uvm = true; + } + if (strstr(line, "nvidia_drm")) { + nvidia_drm = true; } if (strstr(line, "fglrx")) { - fprintf(stderr, "\x1B[1;31mWarning: Proprietary AMD drivers do NOT support Wayland. Use radeon.\x1B[0m\n"); + fprintf(stderr, "\x1B[1;31mWarning: Proprietary AMD drivers do " + "NOT support Wayland. Use radeon.\x1B[0m\n"); free(line); break; } free(line); } fclose(f); + if (nvidia) { + fprintf(stderr, "\x1B[1;31mWarning: Proprietary nvidia driver support " + "is considered experimental. Nouveau is strongly recommended." + "\x1B[0m\n"); + if (!nvidia_modeset || !nvidia_uvm || !nvidia_drm) { + fprintf(stderr, "\x1B[1;31mWarning: You do not have all of the " + "necessary kernel modules loaded for nvidia support. " + "You need nvidia, nvidia_modeset, nvidia_uvm, and nvidia_drm." + "\x1B[0m\n"); + } + f = fopen("/proc/cmdline", "r"); + if (f) { + char *line = read_line(f); + if (line && !strstr(line, "nvidia-drm.modeset=1")) { + fprintf(stderr, "\x1B[1;31mWarning: You must add " + "nvidia-drm.modeset=1 to your kernel command line to use " + "the proprietary driver.\x1B[0m\n"); + } + fclose(f); + free(line); + } + } } void run_as_ipc_client(char *command, char *socket_path) { diff --git a/sway/sway.1.txt b/sway/sway.1.txt index 1a77611d..bc827bd5 100644 --- a/sway/sway.1.txt +++ b/sway/sway.1.txt @@ -51,9 +51,6 @@ rather than switch to something else. Launch sway directly from a tty or via your favorite Wayland-compatible login manager. -*Important note for nvidia users*: The proprietary nvidia driver does _not_ have -support for Wayland as of 2016-06-10. Use nouveau. - Commands -------- |