diff options
| author | Ray Strode <halfline@gmail.com> | 2022-01-20 17:48:30 +0000 |
|---|---|---|
| committer | Ray Strode <halfline@gmail.com> | 2022-01-20 17:48:30 +0000 |
| commit | 8b1237c7b1f3a42d57564098b5a5ff5282849f02 (patch) | |
| tree | 734694e7b8f4e50f12bbe5eb9395626bc9d379c3 | |
| parent | cb49bac2fe1160094eae360f985e54073be3c49a (diff) | |
| parent | dda2fbb175ca00fc4f6c4e3c149464a570e1dca4 (diff) | |
| download | gdm-8b1237c7b1f3a42d57564098b5a5ff5282849f02.tar.gz | |
Merge branch 'wayland-by-default-with-nvidia-510' into 'main'
gdm.rules: Prefer Wayland with NVIDIA >= 510
See merge request GNOME/gdm!169
| -rw-r--r-- | data/61-gdm.rules.in | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/data/61-gdm.rules.in b/data/61-gdm.rules.in index bbc6a00e..e9c72697 100644 --- a/data/61-gdm.rules.in +++ b/data/61-gdm.rules.in @@ -10,7 +10,9 @@ IMPORT{cmdline}="nomodeset", GOTO="gdm_disable_wayland" LABEL="gdm_nomodeset_end" # Disable wayland when nvidia modeset is disabled or when drivers are a lower -# version than 470, in any case always prefer Xorg +# version than 470, +# For versions above 470 but lower than 510 prefer Xorg, +# Above 510, prefer Wayland. KERNEL!="nvidia_drm", GOTO="gdm_nvidia_drm_end" SUBSYSTEM!="module", GOTO="gdm_nvidia_drm_end" ACTION!="add", GOTO="gdm_nvidia_drm_end" @@ -18,6 +20,9 @@ ACTION!="add", GOTO="gdm_nvidia_drm_end" ATTR{parameters/modeset}!="Y", GOTO="gdm_disable_wayland" # disable wayland for nvidia drivers versions lower than 470 ATTR{version}=="4[0-6][0-9].*|[0-3][0-9][0-9].*|[0-9][0-9].*|[0-9].*", GOTO="gdm_disable_wayland" +# For nvidia drivers versions Above 510, keep Wayland by default +ATTR{version}=="[5-9][1-9][0-9].*", GOTO="gdm_end" +# For nvidia drivers versions 470-495, prefer Xorg by default GOTO="gdm_prefer_xorg" LABEL="gdm_nvidia_drm_end" |