Merge ~vanvugt/ubuntu/+source/mutter:fix-1809407 into ~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/disco

[Daniel van Vugt]

Add background-Reload-when-GPU-memory-is-invalidated.patch

to fix corrupt background wallpaper when resuming from suspend on the
Nvidia driver. (LP: #1809407)

[Daniel van Vugt (vanvugt)]

Disco is not a priority, replaced by eoan. So closing.

Unmerged commits

2a7dc7c... by Daniel van Vugt on 2019-09-19

Add background-Reload-when-GPU-memory-is-invalidated.patch

to fix corrupt background wallpaper when resuming from suspend on the
Nvidia driver. (LP: #1809407)

diff --git a/debian/changelog b/debian/changelog
index 83c1e34..7bc4e0c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mutter (3.32.2+git20190711-2ubuntu1~19.04.2) UNRELEASED; urgency=medium
+
+  * Add background-Reload-when-GPU-memory-is-invalidated.patch to fix
+    corrupt background wallpaper when resuming from suspend on the
+    Nvidia driver. (LP: #1809407)
+
+ -- Daniel van Vugt <[e-mail]>  Thu, 19 Sep 2019 17:55:02 +0800
+
 mutter (3.32.2+git20190711-2ubuntu1~19.04.1) disco; urgency=medium
 
   * No-change backport from disco to eoan.
diff --git a/debian/patches/background-Reload-when-GPU-memory-is-invalidated.patch b/debian/patches/background-Reload-when-GPU-memory-is-invalidated.patch
 new file mode 100644
index 0000000..19ecec7
--- /dev/null
+++ b/debian/patches/background-Reload-when-GPU-memory-is-invalidated.patch
@@ -0,0 +1,114 @@
+From 5a486f5b6bf5f838db5dc2bfc5819a0cba5d2d19 Mon Sep 17 00:00:00 2001
+From: Daniel van Vugt <[e-mail]>
+Date: Thu, 23 May 2019 18:15:28 +0800
+Subject: [PATCH] background: Reload when GPU memory is invalidated
+
+Fixes corrupt background wallpaper when resuming from suspend on the
+Nvidia driver.
+
+Bug: https://gitlab.gnome.org/GNOME/gnome-shell/issues/1084
+Bug-Ubuntu: http://launchpad.net/bugs/1809407
+Origin: https://gitlab.gnome.org/GNOME/mutter/commit/5a486f5b6
+Forwarded: yes
+
+diff --git a/src/compositor/meta-background.c b/src/compositor/meta-background.c
+index c033395fe..387ce5dd3 100644
+--- a/src/compositor/meta-background.c
++++ b/src/compositor/meta-background.c
+@@ -252,12 +252,11 @@ static void
+ set_file (MetaBackground       *self,
+           GFile               **filep,
+           MetaBackgroundImage **imagep,
+-          GFile                *file)
++          GFile                *file,
++          gboolean              force_reload)
+ {
+-  if (!file_equal0 (*filep, file))
++  if (force_reload || !file_equal0 (*filep, file))
+     {
+-      g_clear_object (filep);
+-
+       if (*imagep)
+         {
+           g_signal_handlers_disconnect_by_func (*imagep,
+@@ -267,11 +266,12 @@ set_file (MetaBackground       *self,
+           *imagep = NULL;
+         }
+ 
++      g_set_object (filep, file);
++
+       if (file)
+         {
+           MetaBackgroundImageCache *cache = meta_background_image_cache_get_default ();
+ 
+-          *filep = g_object_ref (file);
+           *imagep = meta_background_image_cache_load (cache, file);
+           g_signal_connect (*imagep, "loaded",
+                             G_CALLBACK (on_background_loaded), self);
+@@ -279,6 +279,32 @@ set_file (MetaBackground       *self,
+     }
+ }
+ 
++static void
++on_gl_video_memory_purged (MetaBackground *self)
++{
++  MetaBackgroundImageCache *cache = meta_background_image_cache_get_default ();
++
++  /* The GPU memory that just got invalidated is the texture inside
++   * self->background_image1,2 and/or its mipmaps. However, to save memory the
++   * original pixbuf isn't kept in RAM so we can't do a simple re-upload. The
++   * only copy of the image was the one in texture memory that got invalidated.
++   * So we need to do a full reload from disk.
++   */
++  if (self->file1)
++    {
++      meta_background_image_cache_purge (cache, self->file1);
++      set_file (self, &self->file1, &self->background_image1, self->file1, TRUE);
++    }
++
++  if (self->file2)
++    {
++      meta_background_image_cache_purge (cache, self->file2);
++      set_file (self, &self->file2, &self->background_image2, self->file2, TRUE);
++    }
++
++  mark_changed (self);
++}
++
+ static void
+ meta_background_dispose (GObject *object)
+ {
+@@ -287,8 +313,8 @@ meta_background_dispose (GObject *object)
+   free_color_texture (self);
+   free_wallpaper_texture (self);
+ 
+-  set_file (self, &self->file1, &self->background_image1, NULL);
+-  set_file (self, &self->file2, &self->background_image2, NULL);
++  set_file (self, &self->file1, &self->background_image1, NULL, FALSE);
++  set_file (self, &self->file2, &self->background_image2, NULL, FALSE);
+ 
+   set_display (self, NULL);
+ 
+@@ -312,7 +338,7 @@ meta_background_constructed (GObject *object)
+   G_OBJECT_CLASS (meta_background_parent_class)->constructed (object);
+ 
+   g_signal_connect_object (self->display, "gl-video-memory-purged",
+-                           G_CALLBACK (mark_changed), object, G_CONNECT_SWAPPED);
++                           G_CALLBACK (on_gl_video_memory_purged), object, G_CONNECT_SWAPPED);
+ 
+   g_signal_connect_object (monitor_manager, "monitors-changed",
+                            G_CALLBACK (on_monitors_changed), self,
+@@ -937,8 +963,8 @@ meta_background_set_blend (MetaBackground          *self,
+   g_return_if_fail (META_IS_BACKGROUND (self));
+   g_return_if_fail (blend_factor >= 0.0 && blend_factor <= 1.0);
+ 
+-  set_file (self, &self->file1, &self->background_image1, file1);
+-  set_file (self, &self->file2, &self->background_image2, file2);
++  set_file (self, &self->file1, &self->background_image1, file1, FALSE);
++  set_file (self, &self->file2, &self->background_image2, file2, FALSE);
+ 
+   self->blend_factor = blend_factor;
+   self->style = style;
+-- 
+2.20.1
+
diff --git a/debian/patches/series b/debian/patches/series
index d4f2ccb..4a545bc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ meson-add-back-default_driver-option.patch
 debian/synaptics-support.patch
 x11-Add-support-for-fractional-scaling-using-Randr.patch
 debian/Revert-meson-Bump-meson-requirement-to-0.50.0.patch
+background-Reload-when-GPU-memory-is-invalidated.patch