From 32cabdadde5e272a8f045208fe4af1d47e4c3854 Mon Sep 17 00:00:00 2001 From: rpm-build Date: Tue, 27 Sep 2022 10:00:11 -0400 Subject: [PATCH] udev: Stick with wayland on hybrid nvidia with vendor driver F36 defaulted to wayland for users with hybrid graphics that use the vendor nvidia driver. We shouldn't change behavior so close to f37 release, so this commit brings that behavior back. --- data/61-gdm.rules.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/data/61-gdm.rules.in b/data/61-gdm.rules.in index a4f841bdf..addfc3119 100644 --- a/data/61-gdm.rules.in +++ b/data/61-gdm.rules.in @@ -82,12 +82,14 @@ ENV{GDM_NUMBER_OF_GRAPHICS_CARDS}=="1", RUN+="/usr/bin/rm -f /run/udev/gdm-machi ENV{GDM_NUMBER_OF_GRAPHICS_CARDS}!="1", RUN+="/usr/bin/touch /run/udev/gdm-machine-has-hybrid-graphics" LABEL="gdm_hybrid_graphics_check_end" -# If this is a hybrid graphics laptop with vendor nvidia driver, disable wayland +# If this is a hybrid graphics laptop with vendor nvidia driver default to wayland +# It gives poor performance for multi-monitor, but Xorg fails some multi-monitor +# setups too, and this is what we did in F36. LABEL="gdm_hybrid_nvidia_laptop_check" TEST!="/run/udev/gdm-machine-is-laptop", GOTO="gdm_hybrid_nvidia_laptop_check_end" TEST!="/run/udev/gdm-machine-has-hybrid-graphics", GOTO="gdm_hybrid_nvidia_laptop_check_end" TEST!="/run/udev/gdm-machine-has-vendor-nvidia-driver", GOTO="gdm_hybrid_nvidia_laptop_check_end" -GOTO="gdm_disable_wayland" +GOTO="gdm_end" LABEL="gdm_hybrid_nvidia_laptop_check_end" # Disable wayland in situation where we're in a guest with a virtual gpu and host passthrough gpu -- 2.40.0