brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

renderer/native: Discard page flip retries when rebuilding views

Browse Source 
Rebuilding views means we don't care to retry page flip attempts for
previous views, especially since connectors may have been disconnected,
making a page flip retry hit an assert a flipped CRTC has connectors
associated with it.

https://gitlab.gnome.org/GNOME/mutter/merge_requests/655
This commit is contained in:
Jonas Ådahl
2019-06-19 21:14:05 +02:00
parent 83ce89ef59
commit c5fb1d1975
1 changed files with 39 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3060,6 +3060,24 @@ destroy_egl_surface (CoglOnscreen *onscreen)
} }
} }
static void
discard_onscreen_page_flip_retries (MetaOnscreenNative *onscreen_native)
{
g_list_free_full (onscreen_native->pending_page_flip_retries,
(GDestroyNotify) retry_page_flip_data_free);
onscreen_native->pending_page_flip_retries = NULL;
if (onscreen_native->retry_page_flips_source)
{
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);
}
}
static void static void
meta_renderer_native_release_onscreen (CoglOnscreen *onscreen) meta_renderer_native_release_onscreen (CoglOnscreen *onscreen)
{ {
@@ -3090,17 +3108,7 @@ meta_renderer_native_release_onscreen (CoglOnscreen *onscreen)
g_warning ("Failed to clear current context"); g_warning ("Failed to clear current context");
} }
g_list_free_full (onscreen_native->pending_page_flip_retries, discard_onscreen_page_flip_retries (onscreen_native);
(GDestroyNotify) retry_page_flip_data_free);
if (onscreen_native->retry_page_flips_source)
{
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);
}
renderer_gpu_data = renderer_gpu_data =
meta_renderer_native_get_gpu_data (onscreen_native->renderer_native, meta_renderer_native_get_gpu_data (onscreen_native->renderer_native,
@@ -3555,12 +3563,32 @@ meta_renderer_native_create_view (MetaRenderer *renderer,
return view; return view;
} }
static void
discard_page_flip_retries (MetaRenderer *renderer)
{
GList *l;
for (l = meta_renderer_get_views (renderer); l; l = l->next)
{
ClutterStageView *stage_view = l->data;
CoglFramebuffer *framebuffer =
clutter_stage_view_get_onscreen (stage_view);
CoglOnscreen *onscreen = COGL_ONSCREEN (framebuffer);
CoglOnscreenEGL *onscreen_egl = onscreen->winsys;
MetaOnscreenNative *onscreen_native = onscreen_egl->platform;
discard_onscreen_page_flip_retries (onscreen_native);
}
}
static void static void
meta_renderer_native_rebuild_views (MetaRenderer *renderer) meta_renderer_native_rebuild_views (MetaRenderer *renderer)
{ {
MetaRendererClass *parent_renderer_class = MetaRendererClass *parent_renderer_class =
META_RENDERER_CLASS (meta_renderer_native_parent_class); META_RENDERER_CLASS (meta_renderer_native_parent_class);
discard_page_flip_retries (renderer);
parent_renderer_class->rebuild_views (renderer); parent_renderer_class->rebuild_views (renderer);
meta_renderer_native_queue_modes_reset (META_RENDERER_NATIVE (renderer)); meta_renderer_native_queue_modes_reset (META_RENDERER_NATIVE (renderer));