From ff07eab85b5c6b728ad3cc99d02e9f2ae8b9854f Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Tue, 12 Dec 2023 15:25:10 +0100 Subject: Detect Nvidia proprietary driver via drmGetVersion() This is less punishing for users with the Nvidia driver loaded but not used by Sway (e.g. for CUDA). --- sway/main.c | 29 +---------------------------- 1 file changed, 1 insertion(+), 28 deletions(-) (limited to 'sway/main.c') diff --git a/sway/main.c b/sway/main.c index 0db116d3..98aba7f2 100644 --- a/sway/main.c +++ b/sway/main.c @@ -49,32 +49,6 @@ void sig_handler(int signal) { sway_terminate(EXIT_SUCCESS); } -void detect_proprietary(int allow_unsupported_gpu) { - FILE *f = fopen("/proc/modules", "r"); - if (!f) { - return; - } - char *line = NULL; - size_t line_size = 0; - while (getline(&line, &line_size, f) != -1) { - if (strncmp(line, "nvidia ", 7) == 0) { - if (allow_unsupported_gpu) { - sway_log(SWAY_ERROR, - "!!! Proprietary Nvidia drivers are in use !!!"); - } else { - sway_log(SWAY_ERROR, - "Proprietary Nvidia drivers are NOT supported. " - "Use Nouveau. To launch sway anyway, launch with " - "--unsupported-gpu and DO NOT report issues."); - exit(EXIT_FAILURE); - } - break; - } - } - free(line); - fclose(f); -} - void run_as_ipc_client(char *command, char *socket_path) { int socketfd = ipc_open_socket(socket_path); uint32_t len = strlen(command); @@ -243,7 +217,7 @@ static const char usage[] = "\n"; int main(int argc, char **argv) { - static bool verbose = false, debug = false, validate = false, allow_unsupported_gpu = false; + static bool verbose = false, debug = false, validate = false; char *config_path = NULL; @@ -351,7 +325,6 @@ int main(int argc, char **argv) { return 0; } - detect_proprietary(allow_unsupported_gpu); increase_nofile_limit(); // handle SIGTERM signals -- cgit v1.2.3