From 9ecf839913846211ffe10e1243a360c3cb66ff61 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Thu, 22 Jul 2021 13:09:25 -0400 Subject: data: Enable wayland for single GPU vendor nvidia machines NVidia's wayland story is in a lot better shape these days, so disabling wayland entirely by default is a big too much. This commit changes the udev rule to just default to Xorg on single GPU nvidia vendor driver systems instead of disabling wayland --- data/61-gdm.rules.in | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'data') diff --git a/data/61-gdm.rules.in b/data/61-gdm.rules.in index b1da191f..8566bf55 100644 --- a/data/61-gdm.rules.in +++ b/data/61-gdm.rules.in @@ -1,6 +1,10 @@ # disable Wayland on Hi1710 chipsets ATTR{vendor}=="0x19e5", ATTR{device}=="0x1711", RUN+="@libexecdir@/gdm-runtime-config set daemon WaylandEnable false" -# disable Wayland when using the proprietary nvidia driver -DRIVER=="nvidia", 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" +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" -- cgit v1.2.1