File _service:download_url:3138.patch of Package mutter

Overview Repositories Revisions Requests Users Attributes Meta

File _service:download_url:3138.patch of Package mutter (Revision 8dfbb966b7b1ef2aabba73d93a18aa12)

Currently displaying revision 8dfbb966b7b1ef2aabba73d93a18aa12 , Show latest

From feb069c5b12155a78cd682b3e7559eb66c3cbda4 Mon Sep 17 00:00:00 2001
From: Daniel van Vugt <daniel.van.vugt@canonical.com>
Date: Wed, 26 Jul 2023 17:58:03 +0800
Subject: [PATCH 1/6] kms/update: Remove unused is_flushing function

---
 src/backends/native/meta-kms-update.c | 7 -------
 src/backends/native/meta-kms-update.h | 3 ---
 2 files changed, 10 deletions(-)

diff --git a/src/backends/native/meta-kms-update.c b/src/backends/native/meta-kms-update.c
index 33968ee838b..7658db0ca61 100644
--- a/src/backends/native/meta-kms-update.c
+++ b/src/backends/native/meta-kms-update.c
@@ -1092,13 +1092,6 @@ meta_kms_update_set_flushing (MetaKmsUpdate *update,
   update_latch_crtc (update, crtc);
 }
 
-gboolean
-meta_kms_update_is_flushing (MetaKmsUpdate *update,
-                             MetaKmsCrtc   *crtc)
-{
-  return update->latch_crtc == crtc;
-}
-
 MetaKmsCrtc *
 meta_kms_update_get_latch_crtc (MetaKmsUpdate *update)
 {
diff --git a/src/backends/native/meta-kms-update.h b/src/backends/native/meta-kms-update.h
index b71f60a13a9..5550158e9fd 100644
--- a/src/backends/native/meta-kms-update.h
+++ b/src/backends/native/meta-kms-update.h
@@ -111,9 +111,6 @@ void meta_kms_update_free (MetaKmsUpdate *update);
 void meta_kms_update_set_flushing (MetaKmsUpdate *update,
                                    MetaKmsCrtc   *crtc);
 
-gboolean meta_kms_update_is_flushing (MetaKmsUpdate *update,
-                                      MetaKmsCrtc   *crtc);
-
 META_EXPORT_TEST
 MetaKmsDevice * meta_kms_update_get_device (MetaKmsUpdate *update);
 
-- 
GitLab

From 1a680f0f8d04628989b6344c967eb3b5134c54a4 Mon Sep 17 00:00:00 2001
From: Daniel van Vugt <daniel.van.vugt@canonical.com>
Date: Wed, 26 Jul 2023 17:27:10 +0800
Subject: [PATCH 2/6] onscreen/native: Move await_flush to *after* GL is
 finished rendering

So as to not block the deadline timer from updating the cursor smoothly
during long GL renders. This also fixes a deadlock in triple buffering.
---
 src/backends/native/meta-onscreen-native.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/backends/native/meta-onscreen-native.c b/src/backends/native/meta-onscreen-native.c
index a3ba447112b..fa07c34e460 100644
--- a/src/backends/native/meta-onscreen-native.c
+++ b/src/backends/native/meta-onscreen-native.c
@@ -431,6 +431,9 @@ meta_onscreen_native_flip_crtc (CoglOnscreen                *onscreen,
   COGL_TRACE_BEGIN_SCOPED (MetaOnscreenNativeFlipCrtcs,
                            "Onscreen (flip CRTCs)");
 
+  meta_kms_device_await_flush (meta_kms_crtc_get_device (kms_crtc),
+                               kms_crtc);
+
   gpu_kms = META_GPU_KMS (meta_crtc_get_gpu (crtc));
 
   g_assert (meta_gpu_kms_is_crtc_active (gpu_kms, crtc));
@@ -1430,12 +1433,6 @@ void
 meta_onscreen_native_before_redraw (CoglOnscreen *onscreen,
                                     ClutterFrame *frame)
 {
-  MetaOnscreenNative *onscreen_native = META_ONSCREEN_NATIVE (onscreen);
-  MetaCrtcKms *crtc_kms = META_CRTC_KMS (onscreen_native->crtc);
-  MetaKmsCrtc *kms_crtc = meta_crtc_kms_get_kms_crtc (crtc_kms);
-
-  meta_kms_device_await_flush (meta_kms_crtc_get_device (kms_crtc),
-                               kms_crtc);
 }
 
 void
-- 
GitLab

From 3a7cccded95205308df88fd1bf9e5ca89a3f4f1a Mon Sep 17 00:00:00 2001
From: Daniel van Vugt <daniel.van.vugt@canonical.com>
Date: Wed, 26 Jul 2023 17:34:07 +0800
Subject: [PATCH 3/6] backends/native: Remove now unused before_redraw
 functions

---
 src/backends/native/meta-onscreen-native.c |  6 ------
 src/backends/native/meta-onscreen-native.h |  3 ---
 src/backends/native/meta-renderer-native.c | 16 ----------------
 src/backends/native/meta-renderer-native.h |  4 ----
 src/backends/native/meta-stage-native.c    |  6 ------
 5 files changed, 35 deletions(-)

diff --git a/src/backends/native/meta-onscreen-native.c b/src/backends/native/meta-onscreen-native.c
index fa07c34e460..e0a76653c42 100644
--- a/src/backends/native/meta-onscreen-native.c
+++ b/src/backends/native/meta-onscreen-native.c
@@ -1429,12 +1429,6 @@ add_onscreen_frame_info (MetaCrtc *crtc)
                                            CLUTTER_STAGE_VIEW (view));
 }
 
-void
-meta_onscreen_native_before_redraw (CoglOnscreen *onscreen,
-                                    ClutterFrame *frame)
-{
-}
-
 void
 meta_onscreen_native_prepare_frame (CoglOnscreen *onscreen,
                                     ClutterFrame *frame)
diff --git a/src/backends/native/meta-onscreen-native.h b/src/backends/native/meta-onscreen-native.h
index 3ec3277a37b..05a9ecdb8b0 100644
--- a/src/backends/native/meta-onscreen-native.h
+++ b/src/backends/native/meta-onscreen-native.h
@@ -40,9 +40,6 @@ void meta_renderer_native_release_onscreen (CoglOnscreen *onscreen);
 void meta_onscreen_native_prepare_frame (CoglOnscreen *onscreen,
                                          ClutterFrame *frame);
 
-void meta_onscreen_native_before_redraw (CoglOnscreen *onscreen,
-                                         ClutterFrame *frame);
-
 void meta_onscreen_native_finish_frame (CoglOnscreen *onscreen,
                                         ClutterFrame *frame);
 
diff --git a/src/backends/native/meta-renderer-native.c b/src/backends/native/meta-renderer-native.c
index 6826fe92556..d8521efd6d6 100644
--- a/src/backends/native/meta-renderer-native.c
+++ b/src/backends/native/meta-renderer-native.c
@@ -1555,22 +1555,6 @@ meta_renderer_native_prepare_frame (MetaRendererNative *renderer_native,
     }
 }
 
-void
-meta_renderer_native_before_redraw (MetaRendererNative *renderer_native,
-                                    MetaRendererView   *view,
-                                    ClutterFrame       *frame)
-{
-  CoglFramebuffer *framebuffer =
-    clutter_stage_view_get_onscreen (CLUTTER_STAGE_VIEW (view));
-
-  if (COGL_IS_ONSCREEN (framebuffer))
-    {
-      CoglOnscreen *onscreen = COGL_ONSCREEN (framebuffer);
-
-      meta_onscreen_native_before_redraw (onscreen, frame);
-    }
-}
-
 void
 meta_renderer_native_finish_frame (MetaRendererNative *renderer_native,
                                    MetaRendererView   *view,
diff --git a/src/backends/native/meta-renderer-native.h b/src/backends/native/meta-renderer-native.h
index 3af3666cc73..f3488188959 100644
--- a/src/backends/native/meta-renderer-native.h
+++ b/src/backends/native/meta-renderer-native.h
@@ -61,10 +61,6 @@ void meta_renderer_native_prepare_frame (MetaRendererNative *renderer_native,
                                          MetaRendererView   *view,
                                          ClutterFrame       *frame);
 
-void meta_renderer_native_before_redraw (MetaRendererNative *renderer_native,
-                                         MetaRendererView   *view,
-                                         ClutterFrame       *frame);
-
 void meta_renderer_native_finish_frame (MetaRendererNative *renderer_native,
                                         MetaRendererView   *view,
                                         ClutterFrame       *frame);
diff --git a/src/backends/native/meta-stage-native.c b/src/backends/native/meta-stage-native.c
index 031d82d8f4a..8cdf6cb02c2 100644
--- a/src/backends/native/meta-stage-native.c
+++ b/src/backends/native/meta-stage-native.c
@@ -139,14 +139,8 @@ meta_stage_native_redraw_view (ClutterStageWindow *stage_window,
                                ClutterStageView   *view,
                                ClutterFrame       *frame)
 {
-  MetaStageImpl *stage_impl = META_STAGE_IMPL (stage_window);
-  MetaBackend *backend = meta_stage_impl_get_backend (stage_impl);
-  MetaRenderer *renderer = meta_backend_get_renderer (backend);
   MetaCrtc *crtc;
 
-  meta_renderer_native_before_redraw (META_RENDERER_NATIVE (renderer),
-                                      META_RENDERER_VIEW (view), frame);
-
   clutter_stage_window_parent_iface->redraw_view (stage_window, view, frame);
 
   crtc = meta_renderer_view_get_crtc (META_RENDERER_VIEW (view));
-- 
GitLab

From 2f43f84689dc1698248cf8cacf9e51c8d81eb4a3 Mon Sep 17 00:00:00 2001
From: Daniel van Vugt <daniel.van.vugt@canonical.com>
Date: Wed, 26 Jul 2023 17:59:40 +0800
Subject: [PATCH 4/6] kms/impl-device: Inline queue_update into
 meta_kms_impl_device_handle_update

It only had one caller and that caller always has pending_page_flip == TRUE,
so all the deadline timer logic in queue_update was unused. Drop the unused
deadline timer calls and move the remaining if statement into the caller.
---
 src/backends/native/meta-kms-impl-device.c | 63 ++++------------------
 1 file changed, 11 insertions(+), 52 deletions(-)

diff --git a/src/backends/native/meta-kms-impl-device.c b/src/backends/native/meta-kms-impl-device.c
index f13ce54295e..476e240dfbd 100644
--- a/src/backends/native/meta-kms-impl-device.c
+++ b/src/backends/native/meta-kms-impl-device.c
@@ -1382,56 +1382,6 @@ ensure_crtc_frame (MetaKmsImplDevice *impl_device,
   return crtc_frame;
 }
 
-static gboolean
-queue_update (MetaKmsImplDevice *impl_device,
-              CrtcFrame         *crtc_frame,
-              MetaKmsUpdate     *update)
-{
-  MetaKmsImpl *impl = meta_kms_impl_device_get_impl (impl_device);
-  MetaThreadImpl *thread_impl = META_THREAD_IMPL (impl);
-  int64_t next_presentation_us = 0;
-  int64_t next_deadline_us = 0;
-  g_autoptr (GError) error = NULL;
-
-  g_assert (update);
-
-  if (meta_thread_impl_is_realtime (thread_impl) &&
-      !crtc_frame->deadline.armed)
-    {
-      if (!meta_kms_crtc_determine_deadline (crtc_frame->crtc,
-                                             &next_deadline_us,
-                                             &next_presentation_us,
-                                             &error))
-        {
-          if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND))
-            g_critical ("Failed to determine deadline: %s", error->message);
-          return FALSE;
-        }
-    }
-
-  if (crtc_frame->pending_update)
-    {
-      meta_kms_update_merge_from (crtc_frame->pending_update, update);
-      meta_kms_update_free (update);
-    }
-  else
-    {
-      crtc_frame->pending_update = update;
-    }
-
-  if (meta_thread_impl_is_realtime (thread_impl) &&
-      !crtc_frame->pending_page_flip &&
-      !crtc_frame->await_flush &&
-      next_deadline_us)
-    {
-      arm_crtc_frame_deadline_timer (crtc_frame,
-                                     next_deadline_us,
-                                     next_presentation_us);
-    }
-
-  return TRUE;
-}
-
 void
 meta_kms_impl_device_handle_update (MetaKmsImplDevice *impl_device,
                                     MetaKmsUpdate     *update,
@@ -1479,8 +1429,17 @@ meta_kms_impl_device_handle_update (MetaKmsImplDevice *impl_device,
                   meta_kms_crtc_get_id (latch_crtc),
                   priv->path);
 
-      if (queue_update (impl_device, crtc_frame, update))
-        return;
+      if (crtc_frame->pending_update)
+        {
+          meta_kms_update_merge_from (crtc_frame->pending_update, update);
+          meta_kms_update_free (update);
+        }
+      else
+        {
+          crtc_frame->pending_update = update;
+        }
+
+      return;
     }
 
   if (crtc_frame->pending_update)
-- 
GitLab

From 4702cf2365ed5112d27abd454423addd6bfc3dae Mon Sep 17 00:00:00 2001
From: Daniel van Vugt <daniel.van.vugt@canonical.com>
Date: Fri, 28 Jul 2023 14:14:42 +0800
Subject: [PATCH 5/6] kms/impl-device: Avoid retrying a failing deadline timer

So as to not fill the log with:
Failed to determine deadline: drmWaitVBlank failed: Operation not permitted

This currently happens on nvidia-drm but hopefully Nvidia will fix that
in future.
---
 src/backends/native/meta-kms-impl-device.c | 33 ++++++++++++++++++----
 1 file changed, 28 insertions(+), 5 deletions(-)

diff --git a/src/backends/native/meta-kms-impl-device.c b/src/backends/native/meta-kms-impl-device.c
index 476e240dfbd..a2cf2aca02f 100644
--- a/src/backends/native/meta-kms-impl-device.c
+++ b/src/backends/native/meta-kms-impl-device.c
@@ -99,6 +99,8 @@ typedef struct _MetaKmsImplDevicePrivate
   GList *fallback_modes;
 
   GHashTable *crtc_frames;
+
+  gboolean deadline_timer_failed;
 } MetaKmsImplDevicePrivate;
 
 static void
@@ -1331,6 +1333,25 @@ get_crtc_frame (MetaKmsImplDevice *impl_device,
   return g_hash_table_lookup (priv->crtc_frames, latch_crtc);
 }
 
+static gboolean
+using_deadline_timer (MetaKmsImplDevice *impl_device)
+{
+  MetaKmsImplDevicePrivate *priv =
+    meta_kms_impl_device_get_instance_private (impl_device);
+
+  if (priv->deadline_timer_failed)
+    {
+      return FALSE;
+    }
+  else
+    {
+      MetaKmsImpl *impl = meta_kms_impl_device_get_impl (impl_device);
+      MetaThreadImpl *thread_impl = META_THREAD_IMPL (impl);
+
+      return meta_thread_impl_is_realtime (thread_impl);
+    }
+}
+
 static CrtcFrame *
 ensure_crtc_frame (MetaKmsImplDevice *impl_device,
                    MetaKmsCrtc       *latch_crtc)
@@ -1351,7 +1372,7 @@ ensure_crtc_frame (MetaKmsImplDevice *impl_device,
   crtc_frame->deadline.timer_fd = -1;
   crtc_frame->await_flush = TRUE;
 
-  if (meta_thread_impl_is_realtime (thread_impl))
+  if (using_deadline_timer (impl_device))
     {
       int timer_fd;
       GSource *source;
@@ -1508,8 +1529,6 @@ void
 meta_kms_impl_device_schedule_process (MetaKmsImplDevice *impl_device,
                                        MetaKmsCrtc       *crtc)
 {
-  MetaKmsImpl *impl = meta_kms_impl_device_get_impl (impl_device);
-  MetaThreadImpl *thread_impl = META_THREAD_IMPL (impl);
   CrtcFrame *crtc_frame;
 
   crtc_frame = ensure_crtc_frame (impl_device, crtc);
@@ -1519,15 +1538,19 @@ meta_kms_impl_device_schedule_process (MetaKmsImplDevice *impl_device,
   if (crtc_frame->await_flush)
     return;
 
-  if (meta_thread_impl_is_realtime (thread_impl))
+  if (using_deadline_timer (impl_device))
     {
       g_autoptr (GError) error = NULL;
+      MetaKmsImplDevicePrivate *priv =
+        meta_kms_impl_device_get_instance_private (impl_device);
 
       if (ensure_deadline_timer_armed (impl_device, crtc_frame, &error))
         return;
 
       if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND))
-        g_critical ("Failed to determine deadline: %s", error->message);
+        g_warning ("Failed to determine deadline: %s", error->message);
+
+      priv->deadline_timer_failed = TRUE;
     }
 
   meta_kms_device_set_needs_flush (meta_kms_crtc_get_device (crtc), crtc);
-- 
GitLab

From 867efa029e6d9c3708120c700d0d4db494743a8d Mon Sep 17 00:00:00 2001
From: Daniel van Vugt <daniel.van.vugt@canonical.com>
Date: Fri, 28 Jul 2023 15:41:49 +0800
Subject: [PATCH 6/6] kms/impl-device: Add missing error handling

This fixes freezes on cursor movement when:

1. meta_onscreen_native_finish_frame would create an empty update.
2. maybe_update_cursor_plane would leave it empty (!cursor_invalidated).
3. do_process would fail to recognise a non-null empty update as an error.
4. meta_kms_impl_device_handle_update would fail to send feedback on errors
   from do_process, because do_process is meant to do it.
5. Page flip listeners would wait forever for feedback that never comes.

Fixes: https://gitlab.gnome.org/GNOME/mutter/-/issues/2924,
       https://gitlab.gnome.org/GNOME/mutter/-/issues/2923
---
 src/backends/native/meta-kms-impl-device.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/backends/native/meta-kms-impl-device.c b/src/backends/native/meta-kms-impl-device.c
index a2cf2aca02f..85c2e312039 100644
--- a/src/backends/native/meta-kms-impl-device.c
+++ b/src/backends/native/meta-kms-impl-device.c
@@ -1214,14 +1214,22 @@ do_process (MetaKmsImplDevice *impl_device,
 
   update = meta_kms_impl_filter_update (impl, latch_crtc, update, flags);
 
-  if (!update)
+  if (!update || meta_kms_update_is_empty (update))
     {
       GError *error;
 
       error = g_error_new (META_KMS_ERROR,
                            META_KMS_ERROR_EMPTY_UPDATE,
                            "Empty update");
-      return meta_kms_feedback_new_failed (NULL, error);
+      feedback = meta_kms_feedback_new_failed (NULL, error);
+
+      if (update)
+        {
+          queue_result_feedback (impl_device, update, feedback);
+          meta_kms_update_free (update);
+        }
+
+      return feedback;
     }
 
   if (!(flags & META_KMS_UPDATE_FLAG_TEST_ONLY))
-- 
GitLab

Places

File _service:download_url:3138.patch of Package mutter (Revision 8dfbb966b7b1ef2aabba73d93a18aa12)

Places