diff options
| author | Ray Strode <halfline@gmail.com> | 2022-01-11 17:55:44 +0000 |
|---|---|---|
| committer | Ray Strode <halfline@gmail.com> | 2022-01-11 17:55:44 +0000 |
| commit | 22c1544bc77971652da67c17cd876d4f81002294 (patch) | |
| tree | 9f8709c6c9b1a38e71e2325dbb2f6b00f054dd02 | |
| parent | eb6d39a2473f4d58431cd599d9e8480c44aaebbc (diff) | |
| parent | 0a87a2b53436d866e2007d5c68349cb4a1cef73e (diff) | |
| download | gdm-22c1544bc77971652da67c17cd876d4f81002294.tar.gz | |
Merge branch 'simpledrm' into 'main'
gdm.rules: Keep wayland enabled for simple-framebuffer DRM drivers
See merge request GNOME/gdm!167
| -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 1156f0d3..bbc6a00e 100644 --- a/data/61-gdm.rules.in +++ b/data/61-gdm.rules.in @@ -2,7 +2,12 @@ ATTR{vendor}=="0x19e5", ATTR{device}=="0x1711", GOTO="gdm_disable_wayland" # disable Wayland if modesetting is disabled -IMPORT{cmdline}="nomodeset", SUBSYSTEM=="drm", KERNEL=="card[0-9]*", GOTO="gdm_disable_wayland" +KERNEL!="card[0-9]*", GOTO="gdm_nomodeset_end" +SUBSYSTEM!="drm", GOTO="gdm_nomodeset_end" +# but keep it enabled for simple framebuffer drivers +DRIVERS=="simple-framebuffer", GOTO="gdm_nomodeset_end" +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 |