diff -Nru gdm3-42.0/debian/changelog gdm3-42.0/debian/changelog --- gdm3-42.0/debian/changelog 2022-04-12 16:09:54.000000000 -0400 +++ gdm3-42.0/debian/changelog 2022-04-15 21:02:08.000000000 -0400 @@ -1,3 +1,23 @@ +gdm3 (42.0-1ubuntu5) jammy; urgency=medium + + * Fix Wayland no longer being available for everyone + - Fix by adding a separate revert patch instead of trying to + rebase the cherry-picked patches (LP: #1969243) + * Please note that Wayland is not currently available for + systems using the Nvidia graphics drivers because those drivers + don't properly handle suspend and resuming from suspend. It is + intended for those drivers to be fixed in a future stable release + update for Ubuntu 22.04 LTS. See bug 1968929 + + -- Jeremy Bicha Fri, 15 Apr 2022 21:02:08 -0400 + +gdm3 (42.0-1ubuntu4) jammy; urgency=medium + + * Drop patch disabling Wayland on hybrid laptops using Nvidia's drivers. + It's not needed for Ubuntu 22.04 LTS (LP: #1968809) + + -- Jeremy Bicha Thu, 14 Apr 2022 14:29:35 -0400 + gdm3 (42.0-1ubuntu3) jammy; urgency=medium * Cherry-pick commits up to March 30 diff -Nru gdm3-42.0/debian/patches/series gdm3-42.0/debian/patches/series --- gdm3-42.0/debian/patches/series 2022-04-12 16:09:54.000000000 -0400 +++ gdm3-42.0/debian/patches/series 2022-04-15 21:02:08.000000000 -0400 @@ -1,3 +1,14 @@ +# Cherry-picked patches +data-Be-a-little-more-specific-when-matching-PCI-cards.patch +data-Disable-GDM-on-hybrid-graphics-laptops-with-vendor-N.patch +data-Disable-wayland-on-nvidia-if-suspend-is-broken.patch +data-Disable-wayland-on-some-server-chips.patch +data-Disable-wayland-on-guests-with-passthrough-and-virt-.patch +data-Disable-wayland-if-there-are-multiple-virtual-gpus.patch +local-display-factory-Fix-type-of-signal-connection-id.patch +local-display-factory-Stop-listening-to-udev-events-when-.patch +Update-Basque-translation.patch +# End cherry-picked patches 16_xserver_path.patch 90_config_comments.patch 91_dconf_database_path.patch @@ -11,12 +22,4 @@ ubuntu/dont_set_language_env.patch ubuntu/prefer_ubuntu_session_fallback.patch ubuntu/XSession-Use-x-terminal-emulator-as-fallback-instead-of-x.patch -data-Be-a-little-more-specific-when-matching-PCI-cards.patch -data-Disable-GDM-on-hybrid-graphics-laptops-with-vendor-N.patch -data-Disable-wayland-on-nvidia-if-suspend-is-broken.patch -data-Disable-wayland-on-some-server-chips.patch -data-Disable-wayland-on-guests-with-passthrough-and-virt-.patch -data-Disable-wayland-if-there-are-multiple-virtual-gpus.patch -local-display-factory-Fix-type-of-signal-connection-id.patch -local-display-factory-Stop-listening-to-udev-events-when-.patch -Update-Basque-translation.patch +ubuntu/Revert-data-Disable-GDM-on-hybrid-graphics-laptops-with-v.patch diff -Nru gdm3-42.0/debian/patches/ubuntu/Revert-data-Disable-GDM-on-hybrid-graphics-laptops-with-v.patch gdm3-42.0/debian/patches/ubuntu/Revert-data-Disable-GDM-on-hybrid-graphics-laptops-with-v.patch --- gdm3-42.0/debian/patches/ubuntu/Revert-data-Disable-GDM-on-hybrid-graphics-laptops-with-v.patch 1969-12-31 19:00:00.000000000 -0500 +++ gdm3-42.0/debian/patches/ubuntu/Revert-data-Disable-GDM-on-hybrid-graphics-laptops-with-v.patch 2022-04-15 21:02:08.000000000 -0400 @@ -0,0 +1,71 @@ +From: Jeremy Bicha +Date: Fri, 15 Apr 2022 20:59:16 -0400 +Subject: Revert "data: Disable GDM on hybrid graphics laptops with vendor + NVidia driver" + +This commit is no longer necessary because Ubuntu carries the patches +from https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2341 + +This reverts commit 440d6f9ecc151fbcf8c852d500c5cc5add168b94. +--- + data/61-gdm.rules.in | 36 ------------------------------------ + 1 file changed, 36 deletions(-) + +diff --git a/data/61-gdm.rules.in b/data/61-gdm.rules.in +index 5bc9941..883639c 100644 +--- a/data/61-gdm.rules.in ++++ b/data/61-gdm.rules.in +@@ -44,14 +44,6 @@ DRIVERS=="simple-framebuffer", GOTO="gdm_nomodeset_end" + IMPORT{cmdline}="nomodeset", GOTO="gdm_disable_wayland" + LABEL="gdm_nomodeset_end" + +-# The vendor nvidia driver has multiple modules that need to be loaded before GDM can make an +-# informed choice on which way to proceed, so force GDM to wait until NVidia's modules are +-# loaded before starting up. +-KERNEL!="nvidia", GOTO="gdm_nvidia_end" +-SUBSYSTEM!="module", GOTO="gdm_nvidia_end" +-ACTION!="add", GOTO="gdm_nvidia_end" +-RUN+="/usr/bin/touch /run/udev/gdm-machine-has-vendor-nvidia-driver" +- + # Check if suspend/resume services necessary for working wayland support is available + TEST{0711}!="/usr/bin/nvidia-sleep.sh", GOTO="gdm_disable_wayland" + TEST{0711}!="/usr/lib/systemd/system-sleep/nvidia", GOTO="gdm_disable_wayland" +@@ -65,33 +57,6 @@ IMPORT{program}="/bin/sh -c 'echo NVIDIA_SUSPEND=`systemctl is-enabled nvidia-su + ENV{NVIDIA_SUSPEND}!="enabled", GOTO="gdm_disable_wayland" + LABEL="gdm_nvidia_end" + +-# If this machine has an internal panel, take note, since it's probably a laptop +-# FIXME: It could be "ghost connectors" make this pop positive for some workstations +-# in the wild. If so, we may have to fallback to looking at the chassis type from +-# dmi data or acpi +-KERNEL!="card[0-9]-eDP-*", GOTO="gdm_laptop_check_end" +-SUBSYSTEM!="drm", GOTO="gdm_laptop_check_end" +-ACTION!="add", GOTO="gdm_laptop_check_end" +-RUN+="/usr/bin/touch /run/udev/gdm-machine-is-laptop" +-GOTO="gdm_hybrid_nvidia_laptop_check" +-LABEL="gdm_laptop_check_end" +- +-# If this is a hybrid graphics setup, take note +-KERNEL!="card[1-9]*", GOTO="gdm_hybrid_graphics_check_end" +-KERNEL=="card[1-9]-*", GOTO="gdm_hybrid_graphics_check_end" +-SUBSYSTEM!="drm", GOTO="gdm_hybrid_graphics_check_end" +-ACTION!="add", GOTO="gdm_hybrid_graphics_check_end" +-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 +-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" +-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 + LABEL="gdm_virt_passthrough_check" + TEST!="/run/udev/gdm-machine-has-hybrid-graphics", GOTO="gdm_virt_passthrough_check_end" +@@ -135,4 +100,3 @@ RUN+="@libexecdir@/gdm-runtime-config set daemon WaylandEnable false" + GOTO="gdm_end" + + LABEL="gdm_end" +-