From 5f14089610fc0fd39624cfa443f80e1e7e4eda3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Thu, 13 May 2021 17:27:34 +0200 Subject: [PATCH] Update to 40.1 --- .gitignore | 1 + 1802.patch | 30 ------ egl-surface-fixes.patch | 231 ---------------------------------------- mutter.spec | 14 +-- sources | 2 +- 5 files changed, 7 insertions(+), 271 deletions(-) delete mode 100644 1802.patch delete mode 100644 egl-surface-fixes.patch diff --git a/.gitignore b/.gitignore index 76acaeb..4be152f 100644 --- a/.gitignore +++ b/.gitignore @@ -184,3 +184,4 @@ mutter-2.31.5.tar.bz2 /mutter-40.beta.tar.xz /mutter-40.rc.tar.xz /mutter-40.0.tar.xz +/mutter-40.1.tar.xz diff --git a/1802.patch b/1802.patch deleted file mode 100644 index 79dbbab..0000000 --- a/1802.patch +++ /dev/null @@ -1,30 +0,0 @@ -From e3bd764491b65b21650997966b7396879d642b10 Mon Sep 17 00:00:00 2001 -From: Takao Fujiwara -Date: Thu, 25 Mar 2021 17:24:19 +0900 -Subject: [PATCH] clutter/input-method: Calculate evdev_code from keycode - -evdev_cocde is forwarded in meta-wayland-keyboard.c:default_grab_key() -in mutter 40 and clutter_input_method_forward_key() should assign -evdev_code. - -Fixes: https://gitlab.gnome.org/GNOME/mutter/-/issues/1709# -Part-of: ---- - clutter/clutter/clutter-input-method.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/clutter/clutter/clutter-input-method.c b/clutter/clutter/clutter-input-method.c -index b24df2e80e..ff62925a51 100644 ---- a/clutter/clutter/clutter-input-method.c -+++ b/clutter/clutter/clutter-input-method.c -@@ -495,6 +495,7 @@ clutter_input_method_forward_key (ClutterInputMethod *im, - event->key.modifier_state = state; - event->key.keyval = keyval; - event->key.hardware_keycode = keycode; -+ event->key.evdev_code = keycode - 8; - event->key.unicode_value = clutter_keysym_to_unicode (keyval); - - clutter_event_set_device (event, keyboard); --- -GitLab - diff --git a/egl-surface-fixes.patch b/egl-surface-fixes.patch deleted file mode 100644 index f993922..0000000 --- a/egl-surface-fixes.patch +++ /dev/null @@ -1,231 +0,0 @@ -From b2cfbe33f75f9929b693372f52c2057b56c7ce65 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jonas=20=C3=85dahl?= -Date: Thu, 25 Mar 2021 15:52:02 +0100 -Subject: [PATCH 1/3] onscreen/native: Remove redundant EGLSurface cleanup - -It's handled by CoglOnscreenEgl's dispose() implementation. It was -failed to be invoked in the past because the old non-GObject web of -vtables were not setup correctly, meaning the old generic EGL layer of -the CoglOnscreen de-init was never invoked. - -When the type inheritence was cleaned up, this mistake was not cleaned -up, so do that now. ---- - src/backends/native/meta-onscreen-native.c | 44 ---------------------- - 1 file changed, 44 deletions(-) - -diff --git a/src/backends/native/meta-onscreen-native.c b/src/backends/native/meta-onscreen-native.c -index 53388e3f64..5ca7408114 100644 ---- a/src/backends/native/meta-onscreen-native.c -+++ b/src/backends/native/meta-onscreen-native.c -@@ -2040,58 +2040,18 @@ meta_onscreen_native_new (MetaRendererNative *renderer_native, - return onscreen_native; - } - --static void --destroy_egl_surface (CoglOnscreen *onscreen) --{ -- CoglOnscreenEgl *onscreen_egl = COGL_ONSCREEN_EGL (onscreen); -- EGLSurface egl_surface; -- -- egl_surface = cogl_onscreen_egl_get_egl_surface (onscreen_egl); -- if (cogl_onscreen_egl_get_egl_surface (onscreen_egl) != EGL_NO_SURFACE) -- { -- MetaOnscreenNative *onscreen_native = META_ONSCREEN_NATIVE (onscreen); -- MetaEgl *egl = meta_onscreen_native_get_egl (onscreen_native); -- CoglFramebuffer *framebuffer = COGL_FRAMEBUFFER (onscreen); -- CoglContext *cogl_context = cogl_framebuffer_get_context (framebuffer); -- CoglRenderer *cogl_renderer = cogl_context->display->renderer; -- CoglRendererEGL *cogl_renderer_egl = cogl_renderer->winsys; -- -- meta_egl_destroy_surface (egl, -- cogl_renderer_egl->edpy, -- egl_surface, -- NULL); -- cogl_onscreen_egl_set_egl_surface (onscreen_egl, EGL_NO_SURFACE); -- } --} -- - static void - meta_onscreen_native_dispose (GObject *object) - { - CoglFramebuffer *framebuffer = COGL_FRAMEBUFFER (object); - CoglOnscreen *onscreen = COGL_ONSCREEN (framebuffer); - CoglContext *cogl_context = cogl_framebuffer_get_context (framebuffer); -- CoglDisplay *cogl_display = cogl_context_get_display (cogl_context); -- CoglDisplayEGL *cogl_display_egl = cogl_display->winsys; -- CoglOnscreenEgl *onscreen_egl = COGL_ONSCREEN_EGL (onscreen); - MetaOnscreenNative *onscreen_native = META_ONSCREEN_NATIVE (onscreen); - MetaRendererNative *renderer_native = onscreen_native->renderer_native; - MetaRendererNativeGpuData *renderer_gpu_data; -- EGLSurface egl_surface; - - G_OBJECT_CLASS (meta_onscreen_native_parent_class)->dispose (object); - -- egl_surface = cogl_onscreen_egl_get_egl_surface (onscreen_egl); -- if (egl_surface != EGL_NO_SURFACE && -- (cogl_display_egl->current_draw_surface == egl_surface || -- cogl_display_egl->current_read_surface == egl_surface)) -- { -- if (!_cogl_winsys_egl_make_current (cogl_display, -- cogl_display_egl->dummy_surface, -- cogl_display_egl->dummy_surface, -- cogl_display_egl->egl_context)) -- g_warning ("Failed to clear current context"); -- } -- - renderer_gpu_data = - meta_renderer_native_get_gpu_data (renderer_native, - onscreen_native->render_gpu); -@@ -2104,8 +2064,6 @@ meta_onscreen_native_dispose (GObject *object) - - free_current_bo (onscreen); - -- destroy_egl_surface (onscreen); -- - g_clear_pointer (&onscreen_native->gbm.surface, gbm_surface_destroy); - break; - case META_RENDERER_NATIVE_MODE_SURFACELESS: -@@ -2115,8 +2073,6 @@ meta_onscreen_native_dispose (GObject *object) - case META_RENDERER_NATIVE_MODE_EGL_DEVICE: - g_clear_object (&onscreen_native->egl.dumb_fb); - -- destroy_egl_surface (onscreen); -- - if (onscreen_native->egl.stream != EGL_NO_STREAM_KHR) - { - MetaEgl *egl = meta_onscreen_native_get_egl (onscreen_native); --- -2.31.1 - - -From c61baca30e7fcc67dc52cad2e8d7ffc35e26b45a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jonas=20=C3=85dahl?= -Date: Thu, 25 Mar 2021 16:22:33 +0100 -Subject: [PATCH 2/3] onscreen/native: Release buffer before destroying - EGLSurface - -Destroying the EGLSurface frees the underlying container structs. When -we call gbm_surface_release_buffer() with a gbm_surface the EGLSurface -was created from, doing that after the EGLSurface was destroyed results -in attempts to access freed memory. Fix this by releasing any buffer -first, followed by destroying the EGLSurface, and lastly, the -gbm_surface. - -This was not a problem prior to CoglOnscreen turning into a GObject, as -in that case, the dispose-chain was not setup correctly, and the -EGLSurface destruction was done in the native backend implementation. - -This also changes a g_return_if_fail() to a g_warn_if_fail(), as if we -hit the unexpected case, we still need to call up to the parent dispose -vfunc to not cause critical issues. ---- - src/backends/native/meta-onscreen-native.c | 9 ++++----- - 1 file changed, 4 insertions(+), 5 deletions(-) - -diff --git a/src/backends/native/meta-onscreen-native.c b/src/backends/native/meta-onscreen-native.c -index 5ca7408114..e8c4355274 100644 ---- a/src/backends/native/meta-onscreen-native.c -+++ b/src/backends/native/meta-onscreen-native.c -@@ -2050,8 +2050,6 @@ meta_onscreen_native_dispose (GObject *object) - MetaRendererNative *renderer_native = onscreen_native->renderer_native; - MetaRendererNativeGpuData *renderer_gpu_data; - -- G_OBJECT_CLASS (meta_onscreen_native_parent_class)->dispose (object); -- - renderer_gpu_data = - meta_renderer_native_get_gpu_data (renderer_native, - onscreen_native->render_gpu); -@@ -2060,11 +2058,9 @@ meta_onscreen_native_dispose (GObject *object) - case META_RENDERER_NATIVE_MODE_GBM: - /* flip state takes a reference on the onscreen so there should - * never be outstanding flips when we reach here. */ -- g_return_if_fail (onscreen_native->gbm.next_fb == NULL); -+ g_warn_if_fail (onscreen_native->gbm.next_fb == NULL); - - free_current_bo (onscreen); -- -- g_clear_pointer (&onscreen_native->gbm.surface, gbm_surface_destroy); - break; - case META_RENDERER_NATIVE_MODE_SURFACELESS: - g_assert_not_reached (); -@@ -2089,6 +2085,9 @@ meta_onscreen_native_dispose (GObject *object) - #endif /* HAVE_EGL_DEVICE */ - } - -+ G_OBJECT_CLASS (meta_onscreen_native_parent_class)->dispose (object); -+ -+ g_clear_pointer (&onscreen_native->gbm.surface, gbm_surface_destroy); - g_clear_pointer (&onscreen_native->secondary_gpu_state, - secondary_gpu_state_free); - } --- -2.31.1 - - -From 48a58abc23791c81c80e8bd16ebc2462308e7552 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jonas=20=C3=85dahl?= -Date: Thu, 25 Mar 2021 18:24:10 +0100 -Subject: [PATCH 3/3] onscreen/native: Make sure to reset the EGL context after - dGPU blit - -On hybrid graphics system, the primary path used to transfer the stage -framebuffer onto the dedicated GPU's video memory preparing for scanout, -is using the dedicated GPU to glBlitFramebuffer() the content from the -iGPU texture onto the scanout buffer. - -After we have done this, we reset the current EGL context back to the -one managed by cogl. What we failed to do, however, was to reset the -current EGL context when we inhibited the actual page flip due to having -entered power save mode. - -When we later started to paint again, Cogl thought the current EGL -context was still the correct one, but in fact it was the one used for -the iGPU -> dGPU blit, causing various EGL surface errors, and as a side -effect, eventually hitting an assert. - -Fix this by making sure we reset to the Cogl managed EGL context also -for this case. ---- - src/backends/native/meta-onscreen-native.c | 18 +++++++++--------- - 1 file changed, 9 insertions(+), 9 deletions(-) - -diff --git a/src/backends/native/meta-onscreen-native.c b/src/backends/native/meta-onscreen-native.c -index e8c4355274..eb49bd45c6 100644 ---- a/src/backends/native/meta-onscreen-native.c -+++ b/src/backends/native/meta-onscreen-native.c -@@ -1071,6 +1071,15 @@ meta_onscreen_native_swap_buffers_with_damage (CoglOnscreen *onscreen, - - update_secondary_gpu_state_post_swap_buffers (onscreen, &egl_context_changed); - -+ /* -+ * If we changed EGL context, cogl will have the wrong idea about what is -+ * current, making it fail to set it when it needs to. Avoid that by making -+ * EGL_NO_CONTEXT current now, making cogl eventually set the correct -+ * context. -+ */ -+ if (egl_context_changed) -+ _cogl_winsys_egl_ensure_current (cogl_display); -+ - power_save_mode = meta_monitor_manager_get_power_save_mode (monitor_manager); - if (power_save_mode == META_POWER_SAVE_ON) - { -@@ -1089,15 +1098,6 @@ meta_onscreen_native_swap_buffers_with_damage (CoglOnscreen *onscreen, - return; - } - -- /* -- * If we changed EGL context, cogl will have the wrong idea about what is -- * current, making it fail to set it when it needs to. Avoid that by making -- * EGL_NO_CONTEXT current now, making cogl eventually set the correct -- * context. -- */ -- if (egl_context_changed) -- _cogl_winsys_egl_ensure_current (cogl_display); -- - COGL_TRACE_BEGIN_SCOPED (MetaRendererNativePostKmsUpdate, - "Onscreen (post pending update)"); - kms_crtc = meta_crtc_kms_get_kms_crtc (META_CRTC_KMS (onscreen_native->crtc)); --- -2.31.1 - diff --git a/mutter.spec b/mutter.spec index 716fc6e..d4079a4 100644 --- a/mutter.spec +++ b/mutter.spec @@ -9,8 +9,8 @@ %global tarball_version %%(echo %{version} | tr '~' '.') Name: mutter -Version: 40.0 -Release: 6%{?dist} +Version: 40.1 +Release: 1%{?dist} Summary: Window and compositing manager based on Clutter License: GPLv2+ @@ -26,13 +26,6 @@ Patch1: 0001-Revert-build-Do-not-provide-built-sources-as-libmutt.patch # Workaround for RHBZ#1936991 (blocks atomic KMS on "tegra" driver) Patch2: 0001-Test-deny-atomic-KMS-for-tegra-RHBZ-1936991.patch -# Fix crash on resume (rhbz#1941971) -Patch3: egl-surface-fixes.patch - -# https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1802 -# Fix enter, space, backspace keys not working with input methods -Patch4: 1802.patch - BuildRequires: pango-devel BuildRequires: startup-notification-devel BuildRequires: gnome-desktop3-devel @@ -173,6 +166,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop %{_datadir}/mutter-%{mutter_api_version}/tests %changelog +* Thu May 13 2021 Florian Müllner - 40.1-1 +- Update to 40.1 + * Tue Apr 13 2021 Kalev Lember - 40.0-6 - Recommend mesa-dri-drivers diff --git a/sources b/sources index b7e3a4a..7b8efe2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mutter-40.0.tar.xz) = af4fd21e5ea7e2cf1004d6912771279cebb2fc60f51f5c7371fd5f6fefbfbd7e36841de98757b8f116b0d2006c1151ccf74ed03ee62836cf59d2a86eaf48084d +SHA512 (mutter-40.1.tar.xz) = c2b6603e1d55492916f742f9cb8e15588cb30e78c37de987404ac40d3befa65e417184305ad87fdffc41052a094790f9e324a1ea7482e5de4f0439dceefed118