isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-25 17:40:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

renderer-native: Freeze frames while retrying to page flip

Browse Source 
We're currently always waiting for unfinished page flips before flipping
again. This is awkward when we are in an asynchronous retry-page-flip
loop, as we can synchronously wait for any KMS page flip event.

To avoid ending up with such situations, just freeze the frame clock
while we're retrying, then thaw it when we succeded.

https://gitlab.gnome.org/GNOME/mutter/merge_requests/506
This commit is contained in:
Jonas Ådahl 2019-03-29 20:56:57 +01:00
parent 808a75b231
commit b2d0184c6e
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/backends/native/meta-renderer-native.c
View File

@ -1703,6 +1703,9 @@ retry_page_flips (gpointer user_data)
} }
else else
{ {
MetaBackend *backend = backend_from_renderer_native (renderer_native);
meta_backend_thaw_updates (backend);
g_clear_pointer (&onscreen_native->retry_page_flips_source, g_clear_pointer (&onscreen_native->retry_page_flips_source,
g_source_unref); g_source_unref);
return G_SOURCE_REMOVE; return G_SOURCE_REMOVE;
@ -1743,6 +1746,8 @@ schedule_retry_page_flip (MetaOnscreenNative *onscreen_native,
if (!onscreen_native->retry_page_flips_source) if (!onscreen_native->retry_page_flips_source)
{ {
MetaBackend *backend =
backend_from_renderer_native (onscreen_native->renderer_native);
GSource *source; GSource *source;
source = g_source_new (&retry_page_flips_source_funcs, sizeof (GSource)); source = g_source_new (&retry_page_flips_source_funcs, sizeof (GSource));
@ -1751,6 +1756,7 @@ schedule_retry_page_flip (MetaOnscreenNative *onscreen_native,
g_source_attach (source, NULL); g_source_attach (source, NULL);
onscreen_native->retry_page_flips_source = source; onscreen_native->retry_page_flips_source = source;
meta_backend_freeze_updates (backend);
} }
else else
{ {
@ -3048,8 +3054,15 @@ meta_renderer_native_release_onscreen (CoglOnscreen *onscreen)
g_list_free_full (onscreen_native->pending_page_flip_retries, g_list_free_full (onscreen_native->pending_page_flip_retries,
(GDestroyNotify) retry_page_flip_data_free); (GDestroyNotify) retry_page_flip_data_free);
g_clear_pointer (&onscreen_native->retry_page_flips_source, if (onscreen_native->retry_page_flips_source)
g_source_destroy); {
MetaBackend *backend =
backend_from_renderer_native (onscreen_native->renderer_native);
meta_backend_thaw_updates (backend);
g_clear_pointer (&onscreen_native->retry_page_flips_source,
g_source_destroy);
}
if (onscreen_egl->egl_surface != EGL_NO_SURFACE) if (onscreen_egl->egl_surface != EGL_NO_SURFACE)
{ {