Daniel van Vugt has proposed merging ~vanvugt/ubuntu/+source/gdm3:fix-lp1705369-eoan into ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/master.
Commit message: Remove revert_nvidia_wayland_blacklist.patch That patch was completely removing the upstream fix for LP: #1705369. The bug which the patch was meant to solve doesn't seem to exist any more, and even if it did it is lower priority affecting 1 person vs 52 people. Now Nvidia desktops with multiple GPUs get a working login screen. Closes: https://bugs.launchpad.net/bugs/1705369 Requested reviews: Didier Roche (didrocks) Ubuntu Desktop (ubuntu-desktop) Related bugs: Bug #1705369 in gnome-shell (Ubuntu): "Ubuntu boots to blank screen when using Nvidia (on a desktop with an unused Intel GPU)" https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/1705369 For more details, see: https://code.launchpad.net/~vanvugt/ubuntu/+source/gdm3/+git/gdm3/+merge/369024 Separately I am also pursuing a fix to mutter!625 upstream. If that fix lands then this one won't be required. Although it doesn't hurt if both land... -- Your team Ubuntu Desktop is requested to review the proposed merge of ~vanvugt/ubuntu/+source/gdm3:fix-lp1705369-eoan into ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/master.
diff --git a/debian/changelog b/debian/changelog index 6f83e1c..381eb51 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +gdm3 (3.32.0-1ubuntu2) eoan; urgency=medium + + * Remove revert_nvidia_wayland_blacklist.patch because it was causing a + much greater problem (LP: #1705369) than it was meant to solve (which + doesn't seem to exist any more either). + + -- Daniel van Vugt <daniel.van.v...@canonical.com> Wed, 19 Jun 2019 15:47:11 +0800 + gdm3 (3.32.0-1ubuntu1) disco; urgency=medium * Merge with Debian. Remaining changes: diff --git a/debian/patches/series b/debian/patches/series index bdcdb4c..6055234 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -12,5 +12,4 @@ ubuntu/revert_override_LANG_with_accountservices.patch ubuntu/config_error_dialog.patch ubuntu/dont_set_language_env.patch ubuntu/prefer_ubuntu_session_fallback.patch -ubuntu/revert_nvidia_wayland_blacklist.patch ubuntu/gdm3.service-wait-for-drm-device-before-trying-to-start-i.patch diff --git a/debian/patches/ubuntu/revert_nvidia_wayland_blacklist.patch b/debian/patches/ubuntu/revert_nvidia_wayland_blacklist.patch deleted file mode 100644 index 3f95c1d..0000000 --- a/debian/patches/ubuntu/revert_nvidia_wayland_blacklist.patch +++ /dev/null @@ -1,27 +0,0 @@ -From: Didier Roche <didro...@ubuntu.com> -Date: Thu, 11 Oct 2018 17:45:57 +0100 -Subject: Revert nvidia from wayland blacklist - -With some nvidia hardware using binary driver, if gdm GNOME Shell -instance is running under Xorg, after logged in, turn into an infinite -restart CPU loop, spiking processor usage to 100%. -This is due to an invalid paint context. -As on ubuntu, our main user session is using Xorg, having GDM using -Wayland is fine, as checked with usptream. So, we can revert nvidia from -the blacklist for now. -Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/mutter/+bug/1797355 -Bug: https://gitlab.gnome.org/GNOME/gdm/issues/429 ---- - data/61-gdm.rules.in | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/data/61-gdm.rules.in b/data/61-gdm.rules.in -index ad5b87d..c9f6110 100644 ---- a/data/61-gdm.rules.in -+++ b/data/61-gdm.rules.in -@@ -2,5 +2,3 @@ - ATTR{vendor}=="0x1013", ATTR{device}=="0x00b8", ATTR{subsystem_vendor}=="0x1af4", ATTR{subsystem_device}=="0x1100", RUN+="@libexecdir@/gdm-disable-wayland" - # disable Wayland on Hi1710 chipsets - ATTR{vendor}=="0x19e5", ATTR{device}=="0x1711", RUN+="@libexecdir@/gdm-disable-wayland" --# disable Wayland when using the proprietary nvidia driver --DRIVER=="nvidia", RUN+="@libexecdir@/gdm-disable-wayland"
-- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
