Merge ~vanvugt/ubuntu/+source/mutter:fix-lp1832138 into ~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/bionic

[Daniel van Vugt]

Add lp1832138-workaround-old-vmwgfx.patch

To work around old versions of the vmwgfx kernel driver that could
result in the screen freezing immediately on startup. (LP: #1832138)

[Daniel van Vugt (vanvugt)]

Hmm, in bug 1832138 it now sounds like we might get a kernel fix instead. If so then this workaround can be dropped.

[Marco Trevisan (Treviño) (3v1n0)]

The workaround works for me, even in disco.

So, if the kernel doesn't get updated earlier, we should land this in both disco and bionic

review: Approve

[Marco Trevisan (Treviño) (3v1n0)]

Ouch, I still had an old kernel in my vm, updating it to standard disco worked even without this patch.

[Daniel van Vugt (vanvugt)]

The fix is for bionic because the bug only exists in kernels older than 4.17.

[Iain Lane (laney)]

It's my understanding that this bug was fixed in the kernel, and so this patch for mutter isn't required. Let me know if that's not true.

review: Disapprove

[Daniel van Vugt (vanvugt)]

"was fixed" is partially correct. The fix has been proposed to the bionic kernel but is not yet Fix Released. My plan was to delete this MP as soon as the kernel fix is released proper.

[Iain Lane (laney)]

On Wed, Jul 10, 2019 at 01:36:05AM -0000, Daniel van Vugt wrote:
> "was fixed" is partially correct.

Thanks for correcting me.

--
Iain Lane [ <email address hidden> ]
Debian Developer [ <email address hidden> ]
Ubuntu Developer [ <email address hidden> ]

Unmerged commits

d6bb181... by Daniel van Vugt on 2019-06-20

Add lp1832138-workaround-old-vmwgfx.patch

To work around old versions of the vmwgfx kernel driver that could
result in the screen freezing immediately on startup. (LP: #1832138)

diff --git a/debian/changelog b/debian/changelog
index 62c0624..e850e64 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mutter (3.28.4-0ubuntu18.04.2) bionic; urgency=medium
+
+  * Add lp1832138-workaround-old-vmwgfx.patch to work around old versions
+    of the vmwgfx kernel driver that could result in the screen freezing
+    immediately on startup. (LP: #1832138)
+
+ -- Daniel van Vugt <[e-mail]>  Thu, 20 Jun 2019 17:32:53 +0800
+
 mutter (3.28.4-0ubuntu18.04.1) bionic; urgency=medium
 
   * New upstream release:
diff --git a/debian/patches/lp1832138-workaround-old-vmwgfx.patch b/debian/patches/lp1832138-workaround-old-vmwgfx.patch
 new file mode 100644
index 0000000..0fde5c5
--- /dev/null
+++ b/debian/patches/lp1832138-workaround-old-vmwgfx.patch
@@ -0,0 +1,25 @@
+Description: renderer-native: Work around broken timing in old vmwgfx
+ The vmwgfx driver in kernels prior to 4.17 reported bogus timestamps using
+ the wrong clock. This would lead us to wait forever (or at least 49 years)
+ before rendering the next frame. There's no decisive way to know this kernel
+ bug is going to happen before it does so just detect timestamps which are
+ obviously going to cause freezes and ignore them.
+Author: Daniel van Vugt <[e-mail]>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1832138
+Forwarded: not-needed
+Last-Update: 2019-06-20
+
+--- a/src/backends/native/meta-renderer-native.c
++++ b/src/backends/native/meta-renderer-native.c
+@@ -1185,6 +1185,11 @@ on_crtc_flipped (GClosure         *closure,
+    */
+   if (refresh_rate >= frame_info->refresh_rate)
+     {
++      int64_t drm_now = _meta_gpu_kms_get_current_time_ns (gpu_kms);
++
++      if (page_flip_time_ns > (drm_now + 1000000000L))
++        page_flip_time_ns = 0;
++
+       frame_info->presentation_time = page_flip_time_ns;
+       frame_info->refresh_rate = refresh_rate;
+     }
diff --git a/debian/patches/series b/debian/patches/series
index 5bf1aa6..6c4463e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,6 +6,7 @@ monitor-manager-use-MonitorsConfig-to-track-switch_config.patch
 monitor-manager-Don-t-use-switch-config-when-ensuring-con.patch
 lp1763892-a-renderer-native-Add-hardware-presentation-timing.patch
 lp1763892-b-renderer-native-Advertise-_FEATURE_SWAP_THROTTLE.patch
+lp1832138-workaround-old-vmwgfx.patch
 debian/synaptics-support.patch
 debian/skip-failing-tests.patch
 debian/skip-failing-tests-325.patch