forked from NixOS/nixpkgs
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
nixos/xserver: Implement configuration of NVIDIA Optimus via PRIME
This adds configuration options which automate the configuration of NVIDIA Optimus using PRIME. This allows using the NVIDIA proprietary driver on Optimus laptops, in order to render using the NVIDIA GPU while outputting to displays connected only to the integrated Intel GPU. It also adds an option for enabling kernel modesetting for the NVIDIA driver (via a kernel command line flag); this is particularly useful together with Optimus/PRIME because it fixes tearing on PRIME-connected screens. The user still needs to enable the Optimus/PRIME feature and specify the bus IDs of the Intel and NVIDIA GPUs, but this is still much easier for users and more reliable. The implementation handles both the X configuration file as well as getting display managers to run certain necessary `xrandr` commands just after X has started. Configuration of commands run after X startup is done using a new configuration option `services.xserver.displayManager.setupCommands`. Support for this option is implemented for LightDM, GDM and SDDM; all of these have been tested with this feature including logging into a Plasma session. Note: support of `setupCommands` for GDM is implemented by making GDM run the session executable via a wrapper; the wrapper will run the `setupCommands` before execing. This seemed like the simplest and most reliable approach, and solves running these commands both for GDM's X server and user X servers (GDM starts separate X servers for itself and user sessions). An alternative approach would be with autostart files but that seems harder to set up and less reliable. Note that some simple features for X configuration file generation (in `xserver.nix`) are added which are used in the implementation: - `services.xserver.extraConfig`: Allows adding arbitrary new sections. This is used to add the Device section for the Intel GPU. - `deviceSection` and `screenSection` within `services.xserver.drivers`. This allows the nvidia configuration module to add additional contents into the `Device` and `Screen` sections of the "nvidia" driver, and not into such sections for other drivers that may be enabled.
- Loading branch information
Showing
10 changed files
with
251 additions
and
26 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
31 changes: 31 additions & 0 deletions
31
pkgs/desktops/gnome-3/core/gdm/gdm-session-worker_forward-vars.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| diff --git a/daemon/gdm-session-worker.c b/daemon/gdm-session-worker.c | ||
| index 9ef4c5b..94da834 100644 | ||
| --- a/daemon/gdm-session-worker.c | ||
| +++ b/daemon/gdm-session-worker.c | ||
| @@ -1515,6 +1515,16 @@ gdm_session_worker_load_env_d (GdmSessionWorker *worker) | ||
| g_object_unref (dir); | ||
| } | ||
|
|
||
| +static void | ||
| +gdm_session_worker_forward_var (GdmSessionWorker *worker, char const *var) | ||
| +{ | ||
| + char const *value = g_getenv(var); | ||
| + if (value != NULL) { | ||
| + g_debug ("forwarding %s= %s", var, value); | ||
| + gdm_session_worker_set_environment_variable(worker, var, value); | ||
| + } | ||
| +} | ||
| + | ||
| static gboolean | ||
| gdm_session_worker_accredit_user (GdmSessionWorker *worker, | ||
| GError **error) | ||
| @@ -1559,6 +1569,9 @@ gdm_session_worker_accredit_user (GdmSessionWorker *worker, | ||
| goto out; | ||
| } | ||
|
|
||
| + gdm_session_worker_forward_var(worker, "GDM_X_SERVER_EXTRA_ARGS"); | ||
| + gdm_session_worker_forward_var(worker, "GDM_X_SESSION_WRAPPER"); | ||
| + | ||
| gdm_session_worker_update_environment_from_passwd_info (worker, | ||
| uid, | ||
| gid, |
17 changes: 0 additions & 17 deletions
17
pkgs/desktops/gnome-3/core/gdm/gdm-session-worker_xserver-path.patch
This file was deleted.
Oops, something went wrong.
40 changes: 40 additions & 0 deletions
40
pkgs/desktops/gnome-3/core/gdm/gdm-x-session_session-wrapper.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| diff --git a/daemon/gdm-x-session.c b/daemon/gdm-x-session.c | ||
| index 88fe96f..b1b140a 100644 | ||
| --- a/daemon/gdm-x-session.c | ||
| +++ b/daemon/gdm-x-session.c | ||
| @@ -664,18 +664,34 @@ spawn_session (State *state, | ||
| state->session_command, | ||
| NULL); | ||
| } else { | ||
| + char const *session_wrapper; | ||
| + char *eff_session_command; | ||
| int ret; | ||
| char **argv; | ||
|
|
||
| - ret = g_shell_parse_argv (state->session_command, | ||
| + session_wrapper = g_getenv("GDM_X_SESSION_WRAPPER"); | ||
| + if (session_wrapper != NULL) { | ||
| + char *quoted_wrapper = g_shell_quote(session_wrapper); | ||
| + eff_session_command = g_strjoin(" ", quoted_wrapper, state->session_command, NULL); | ||
| + g_free(quoted_wrapper); | ||
| + } else { | ||
| + eff_session_command = state->session_command; | ||
| + } | ||
| + | ||
| + ret = g_shell_parse_argv (eff_session_command, | ||
| NULL, | ||
| &argv, | ||
| &error); | ||
|
|
||
| + if (session_wrapper != NULL) { | ||
| + g_free(eff_session_command); | ||
| + } | ||
| + | ||
| if (!ret) { | ||
| g_debug ("could not parse session arguments: %s", error->message); | ||
| goto out; | ||
| } | ||
| + | ||
| subprocess = g_subprocess_launcher_spawnv (launcher, | ||
| (const char * const *) argv, | ||
| &error); |