Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package mutter for openSUSE:Factory checked
in at 2024-04-09 16:46:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mutter (Old)
and /work/SRC/openSUSE:Factory/.mutter.new.29460 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mutter"
Tue Apr 9 16:46:18 2024 rev:226 rq:1166339 version:46.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/mutter/mutter.changes 2024-03-20
21:13:51.312869131 +0100
+++ /work/SRC/openSUSE:Factory/.mutter.new.29460/mutter.changes 2024-04-09
16:46:30.678489174 +0200
@@ -1,0 +2,7 @@
+Mon Apr 8 06:11:23 UTC 2024 - Alynx Zhou <alynx.z...@suse.com>
+
+- Add mutter-fix-front-buffer-lock.patch: Fix front buffer lock
+ error by an unnecessary ensure_fb_id call
+ (glgo#gnome/mutter!3674, bsc#1222409).
+
+-------------------------------------------------------------------
New:
----
mutter-fix-front-buffer-lock.patch
BETA DEBUG BEGIN:
New:
- Add mutter-fix-front-buffer-lock.patch: Fix front buffer lock
error by an unnecessary ensure_fb_id call
BETA DEBUG END:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mutter.spec ++++++
--- /var/tmp/diff_new_pack.uuIMsD/_old 2024-04-09 16:46:31.438517127 +0200
+++ /var/tmp/diff_new_pack.uuIMsD/_new 2024-04-09 16:46:31.442517273 +0200
@@ -38,6 +38,8 @@
Patch3: mutter-fix-x11-restart.patch
# PATCH-FIX-OPENSUSE
0001-Revert-clutter-actor-Cache-stage-relative-instead-of.patch
glgo#GNOME/mutter#3302 bsc#1219546 alynx.z...@suse.com -- Fix partial update on
VT switch
Patch4: 0001-Revert-clutter-actor-Cache-stage-relative-instead-of.patch
+# PATCH-FIX-UPSTREAM mutter-fix-front-buffer-lock.patch glgo#gnome/mutter!3674
bsc#1222409 alynx.z...@suse.com -- Fix front buffer lock error
+Patch5: mutter-fix-front-buffer-lock.patch
## SLE-only patches start at 1000
# PATCH-FEATURE-SLE mutter-SLE-bell.patch FATE#316042 bnc#889218
idon...@suse.com -- make audible bell work out of the box.
@@ -149,6 +151,7 @@
%patch -P 2 -p1
%patch -P 3 -p1
%patch -P 4 -p1
+%patch -P 5 -p1
%endif
# SLE-only patches and translations.
%if 0%{?sle_version}
++++++ mutter-fix-front-buffer-lock.patch ++++++
>From 6fd0a273b669414aa1fcfd4cf193d8e6c9cd2773 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <mdaen...@redhat.com>
Date: Wed, 27 Mar 2024 18:16:17 +0100
Subject: [PATCH] drm-buffer-gbm: Do not call ensure_fb_id from lock_front
When preparing a frame for scanout on a secondary GPU, calling
meta_drm_buffer_gbm_ensure_fb_id for the primary GPU device is
unnecessary and potentially harmful.
Closes: https://gitlab.gnome.org/GNOME/mutter/-/issues/3389
---
src/backends/native/meta-drm-buffer-gbm.c | 2 +-
src/backends/native/meta-onscreen-native.c | 11 +++++++++++
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/src/backends/native/meta-drm-buffer-gbm.c
b/src/backends/native/meta-drm-buffer-gbm.c
index 161d43957d4..4ca8fb0f462 100644
--- a/src/backends/native/meta-drm-buffer-gbm.c
+++ b/src/backends/native/meta-drm-buffer-gbm.c
@@ -186,7 +186,7 @@ lock_front_buffer (MetaDrmBufferGbm *buffer_gbm,
return FALSE;
}
- return meta_drm_buffer_gbm_ensure_fb_id (META_DRM_BUFFER (buffer_gbm),
error);
+ return TRUE;
}
MetaDrmBufferGbm *
diff --git a/src/backends/native/meta-onscreen-native.c
b/src/backends/native/meta-onscreen-native.c
index e40b03f3eaf..f2bae4f00d6 100644
--- a/src/backends/native/meta-onscreen-native.c
+++ b/src/backends/native/meta-onscreen-native.c
@@ -1373,6 +1373,17 @@ meta_onscreen_native_swap_buffers_with_damage
(CoglOnscreen *onscreen,
#endif
}
+ if (!meta_drm_buffer_ensure_fb_id (onscreen_native->gbm.next_fb, &error))
+ {
+ g_warning ("Failed to ensure KMS FB ID on %s: %s",
+ meta_device_file_get_path (render_device_file),
+ error->message);
+
+ frame_info->flags |= COGL_FRAME_INFO_FLAG_SYMBOLIC;
+ meta_onscreen_native_notify_frame_complete (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
--
GitLab
