Merge ~vanvugt/ubuntu/+source/gdm3:fix-lp1705369-eoan into ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/master

Proposed by Daniel van Vugt on 2019-06-19
Status: Merged
Approved by: Didier Roche on 2019-06-24
Approved revision: 9bf7344a3ecd7e28344ad6ac99b914835c3cdde1
Merged at revision: 9bf7344a3ecd7e28344ad6ac99b914835c3cdde1
Proposed branch: ~vanvugt/ubuntu/+source/gdm3:fix-lp1705369-eoan
Merge into: ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/master
Diff against target: 59 lines (+8/-28)
3 files modified
debian/changelog (+8/-0)
debian/patches/series (+0/-1)
dev/null (+0/-27)
Reviewer Review Type Date Requested Status
Didier Roche 2019-06-19 Approve on 2019-06-24
Ubuntu Desktop 2019-06-19 Pending
Review via email: mp+369024@code.launchpad.net

Commit message

Remove revert_nvidia_wayland_blacklist.patch

That patch was removing the upstream fix for LP: #1705369. And the bug
which the patch was meant to solve doesn't seem to exist any more. If it
did still exist then it should probably be solved in a different way
anyway.

Now Nvidia desktops with multiple GPUs get a working login screen.

Closes: https://bugs.launchpad.net/bugs/1705369

Description of the change

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...

To post a comment you must log in.
Didier Roche (didrocks) wrote :

I indeed can't reproduce the issue anymore in eoan, with the patch removed. Let's merge this then, thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index 6f83e1c..381eb51 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,11 @@
6+gdm3 (3.32.0-1ubuntu2) eoan; urgency=medium
7+
8+ * Remove revert_nvidia_wayland_blacklist.patch because it was causing a
9+ much greater problem (LP: #1705369) than it was meant to solve (which
10+ doesn't seem to exist any more either).
11+
12+ -- Daniel van Vugt <daniel.van.vugt@canonical.com> Wed, 19 Jun 2019 15:47:11 +0800
13+
14 gdm3 (3.32.0-1ubuntu1) disco; urgency=medium
15
16 * Merge with Debian. Remaining changes:
17diff --git a/debian/patches/series b/debian/patches/series
18index bdcdb4c..6055234 100644
19--- a/debian/patches/series
20+++ b/debian/patches/series
21@@ -12,5 +12,4 @@ ubuntu/revert_override_LANG_with_accountservices.patch
22 ubuntu/config_error_dialog.patch
23 ubuntu/dont_set_language_env.patch
24 ubuntu/prefer_ubuntu_session_fallback.patch
25-ubuntu/revert_nvidia_wayland_blacklist.patch
26 ubuntu/gdm3.service-wait-for-drm-device-before-trying-to-start-i.patch
27diff --git a/debian/patches/ubuntu/revert_nvidia_wayland_blacklist.patch b/debian/patches/ubuntu/revert_nvidia_wayland_blacklist.patch
28deleted file mode 100644
29index 3f95c1d..0000000
30--- a/debian/patches/ubuntu/revert_nvidia_wayland_blacklist.patch
31+++ /dev/null
32@@ -1,27 +0,0 @@
33-From: Didier Roche <didrocks@ubuntu.com>
34-Date: Thu, 11 Oct 2018 17:45:57 +0100
35-Subject: Revert nvidia from wayland blacklist
36-
37-With some nvidia hardware using binary driver, if gdm GNOME Shell
38-instance is running under Xorg, after logged in, turn into an infinite
39-restart CPU loop, spiking processor usage to 100%.
40-This is due to an invalid paint context.
41-As on ubuntu, our main user session is using Xorg, having GDM using
42-Wayland is fine, as checked with usptream. So, we can revert nvidia from
43-the blacklist for now.
44-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/mutter/+bug/1797355
45-Bug: https://gitlab.gnome.org/GNOME/gdm/issues/429
46----
47- data/61-gdm.rules.in | 2 --
48- 1 file changed, 2 deletions(-)
49-
50-diff --git a/data/61-gdm.rules.in b/data/61-gdm.rules.in
51-index ad5b87d..c9f6110 100644
52---- a/data/61-gdm.rules.in
53-+++ b/data/61-gdm.rules.in
54-@@ -2,5 +2,3 @@
55- ATTR{vendor}=="0x1013", ATTR{device}=="0x00b8", ATTR{subsystem_vendor}=="0x1af4", ATTR{subsystem_device}=="0x1100", RUN+="@libexecdir@/gdm-disable-wayland"
56- # disable Wayland on Hi1710 chipsets
57- ATTR{vendor}=="0x19e5", ATTR{device}=="0x1711", RUN+="@libexecdir@/gdm-disable-wayland"
58--# disable Wayland when using the proprietary nvidia driver
59--DRIVER=="nvidia", RUN+="@libexecdir@/gdm-disable-wayland"

Subscribers

People subscribed via source and target branches