diff options
| author | Ray Strode <rstrode@redhat.com> | 2021-09-07 16:11:41 -0400 |
|---|---|---|
| committer | Ray Strode <halfline@gmail.com> | 2021-09-08 14:18:41 +0000 |
| commit | c6cb49042258f023e6a99fe7994bcd6d3d8df75c (patch) | |
| tree | bfd5b01dc30a1ab02c6762cbd50e3b9d954e5f81 | |
| parent | 89d7606c47aa14366a682cb616e3bd6dc026f2cc (diff) | |
| download | gdm-nvidia-hybrid-fix.tar.gz | |
data: Fix wayland disabling on hybrid nvidia machinesnvidia-hybrid-fix
commit 9ecf839913846211ffe10e1243a360c3cb66ff61 was supposed
to make sure vendor nvidia users on hybrid systems kept getting
Xorg by default.
Unfortunately, I misunderstood the scope of environment changes,
and so the rules don't work as designed.
This commit drops the use of environment and instead just checks
for /sys/module/nvidia_drm directly.
| -rw-r--r-- | data/61-gdm.rules.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/data/61-gdm.rules.in b/data/61-gdm.rules.in index 8566bf55..61d28784 100644 --- a/data/61-gdm.rules.in +++ b/data/61-gdm.rules.in @@ -1,10 +1,10 @@ # disable Wayland on Hi1710 chipsets ATTR{vendor}=="0x19e5", ATTR{device}=="0x1711", RUN+="@libexecdir@/gdm-runtime-config set daemon WaylandEnable false" -# disable Wayland on hybrid systems with vendor nvidia driver # default to Xorg on single gpu vendor nvidia systems -DRIVER=="nvidia", ENV{GDM_HAS_VENDOR_NVIDIA_DRIVER}="1" DRIVER=="nvidia", RUN+="@libexecdir@/gdm-runtime-config set daemon PreferredDisplayServer xorg" -SUBSYSTEM=="drm", KERNEL=="card[1-9]*", ENV{GDM_HAS_NVIDIA_DRIVER}=="1", RUN+="@libexecdir@/gdm-runtime-config set daemon WaylandEnable false" +# disable Wayland on hybrid systems with vendor nvidia driver +SUBSYSTEM=="drm", KERNEL=="card[1-9]*", TEST=="/sys/module/nvidia_drm", RUN+="@libexecdir@/gdm-runtime-config set daemon WaylandEnable false" +# disable Wayland on systems with vendor nvidia driver but modesetting disabled ACTION=="add", SUBSYSTEM=="module", KERNEL=="nvidia_drm", ATTR{parameters/modeset}=="N", RUN+="@libexecdir@/gdm-runtime-config set daemon WaylandEnable false" # disable Wayland if modesetting is disabled IMPORT{cmdline}="nomodeset", RUN+="@libexecdir@/gdm-runtime-config set daemon WaylandEnable false" |