clutter/frame: Make rendering backends set the frame result

Instead of setting the frame result in the most generic layer, have the
backends do it themselves. This is necessary to communicate that a
swap-buffer call didn't really succeed completely to present the swapped
buffer, e.g. errors from KMS.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1488>
This commit is contained in:
Jonas Ådahl 2020-10-09 22:29:24 +02:00 committed by Marge Bot
parent 6bda72e3eb
commit 92d4cb5184
3 changed files with 40 additions and 15 deletions

View File

@ -726,8 +726,6 @@ clutter_stage_cogl_redraw_view (ClutterStageWindow *stage_window,
} }
clutter_stage_cogl_redraw_view_primary (stage_cogl, view, frame); clutter_stage_cogl_redraw_view_primary (stage_cogl, view, frame);
clutter_frame_set_result (frame, CLUTTER_FRAME_RESULT_PENDING_PRESENTED);
} }
static void static void

View File

@ -1939,6 +1939,7 @@ meta_onscreen_native_swap_buffers_with_damage (CoglOnscreen *onscreen,
MetaOnscreenNative *onscreen_native = onscreen_egl->platform; MetaOnscreenNative *onscreen_native = onscreen_egl->platform;
MetaGpuKms *render_gpu = onscreen_native->render_gpu; MetaGpuKms *render_gpu = onscreen_native->render_gpu;
MetaKmsDevice *render_kms_device = meta_gpu_kms_get_kms_device (render_gpu); MetaKmsDevice *render_kms_device = meta_gpu_kms_get_kms_device (render_gpu);
ClutterFrame *frame = user_data;
gboolean egl_context_changed = FALSE; gboolean egl_context_changed = FALSE;
MetaPowerSave power_save_mode; MetaPowerSave power_save_mode;
g_autoptr (GError) error = NULL; g_autoptr (GError) error = NULL;
@ -1947,6 +1948,7 @@ meta_onscreen_native_swap_buffers_with_damage (CoglOnscreen *onscreen,
MetaKmsDevice *kms_device; MetaKmsDevice *kms_device;
MetaKmsUpdateFlag flags; MetaKmsUpdateFlag flags;
g_autoptr (MetaKmsFeedback) kms_feedback = NULL; g_autoptr (MetaKmsFeedback) kms_feedback = NULL;
const GError *feedback_error;
COGL_TRACE_BEGIN_SCOPED (MetaRendererNativeSwapBuffers, COGL_TRACE_BEGIN_SCOPED (MetaRendererNativeSwapBuffers,
"Onscreen (swap-buffers)"); "Onscreen (swap-buffers)");
@ -1999,6 +2001,8 @@ meta_onscreen_native_swap_buffers_with_damage (CoglOnscreen *onscreen,
else else
{ {
queue_dummy_power_save_page_flip (onscreen); queue_dummy_power_save_page_flip (onscreen);
clutter_frame_set_result (frame,
CLUTTER_FRAME_RESULT_PENDING_PRESENTED);
return; return;
} }
@ -2023,19 +2027,25 @@ meta_onscreen_native_swap_buffers_with_damage (CoglOnscreen *onscreen,
flags = META_KMS_UPDATE_FLAG_NONE; flags = META_KMS_UPDATE_FLAG_NONE;
kms_feedback = meta_kms_post_pending_update_sync (kms, kms_device, flags); kms_feedback = meta_kms_post_pending_update_sync (kms, kms_device, flags);
if (meta_kms_feedback_get_result (kms_feedback) != META_KMS_FEEDBACK_PASSED)
switch (meta_kms_feedback_get_result (kms_feedback))
{ {
const GError *error = meta_kms_feedback_get_error (kms_feedback); case META_KMS_FEEDBACK_PASSED:
MetaGpuKms *gpu_kms = clutter_frame_set_result (frame,
META_GPU_KMS (meta_crtc_get_gpu (onscreen_native->crtc)); CLUTTER_FRAME_RESULT_PENDING_PRESENTED);
int64_t now_ns; break;
case META_KMS_FEEDBACK_FAILED:
clutter_frame_set_result (frame,
CLUTTER_FRAME_RESULT_IDLE);
if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_PERMISSION_DENIED)) feedback_error = meta_kms_feedback_get_error (kms_feedback);
g_warning ("Failed to post KMS update: %s", error->message); if (!g_error_matches (feedback_error,
G_IO_ERROR,
now_ns = meta_gpu_kms_get_current_time_ns (gpu_kms); G_IO_ERROR_PERMISSION_DENIED))
notify_view_crtc_presented (onscreen_native->view, kms_crtc, now_ns); g_warning ("Failed to post KMS update: %s", feedback_error->message);
break;
} }
COGL_TRACE_END (MetaRendererNativePostKmsUpdate); COGL_TRACE_END (MetaRendererNativePostKmsUpdate);
} }
@ -2191,10 +2201,12 @@ meta_onscreen_native_direct_scanout (CoglOnscreen *onscreen,
MetaMonitorManager *monitor_manager = MetaMonitorManager *monitor_manager =
meta_backend_get_monitor_manager (backend); meta_backend_get_monitor_manager (backend);
MetaPowerSave power_save_mode; MetaPowerSave power_save_mode;
ClutterFrame *frame = user_data;
MetaKmsCrtc *kms_crtc; MetaKmsCrtc *kms_crtc;
MetaKmsDevice *kms_device; MetaKmsDevice *kms_device;
MetaKmsUpdateFlag flags; MetaKmsUpdateFlag flags;
g_autoptr (MetaKmsFeedback) kms_feedback = NULL; g_autoptr (MetaKmsFeedback) kms_feedback = NULL;
const GError *feedback_error;
power_save_mode = meta_monitor_manager_get_power_save_mode (monitor_manager); power_save_mode = meta_monitor_manager_get_power_save_mode (monitor_manager);
if (power_save_mode != META_POWER_SAVE_ON) if (power_save_mode != META_POWER_SAVE_ON)
@ -2225,13 +2237,18 @@ meta_onscreen_native_direct_scanout (CoglOnscreen *onscreen,
flags = META_KMS_UPDATE_FLAG_PRESERVE_ON_ERROR; flags = META_KMS_UPDATE_FLAG_PRESERVE_ON_ERROR;
kms_feedback = meta_kms_post_pending_update_sync (kms, kms_device, flags); kms_feedback = meta_kms_post_pending_update_sync (kms, kms_device, flags);
if (meta_kms_feedback_get_result (kms_feedback) != META_KMS_FEEDBACK_PASSED) switch (meta_kms_feedback_get_result (kms_feedback))
{ {
const GError *feedback_error = meta_kms_feedback_get_error (kms_feedback); case META_KMS_FEEDBACK_PASSED:
clutter_frame_set_result (frame,
CLUTTER_FRAME_RESULT_PENDING_PRESENTED);
break;
case META_KMS_FEEDBACK_FAILED:
feedback_error = meta_kms_feedback_get_error (kms_feedback);
if (g_error_matches (feedback_error, if (g_error_matches (feedback_error,
G_IO_ERROR, G_IO_ERROR_PERMISSION_DENIED)) G_IO_ERROR, G_IO_ERROR_PERMISSION_DENIED))
return TRUE; break;
g_clear_object (&onscreen_native->gbm.next_fb); g_clear_object (&onscreen_native->gbm.next_fb);
g_propagate_error (error, g_error_copy (feedback_error)); g_propagate_error (error, g_error_copy (feedback_error));

View File

@ -456,6 +456,15 @@ meta_stage_x11_get_views (ClutterStageWindow *stage_window)
return meta_renderer_get_views (renderer); return meta_renderer_get_views (renderer);
} }
static void
meta_stage_x11_redraw_view (ClutterStageWindow *stage_window,
ClutterStageView *view,
ClutterFrame *frame)
{
clutter_stage_window_parent_iface->redraw_view (stage_window, view, frame);
clutter_frame_set_result (frame, CLUTTER_FRAME_RESULT_PENDING_PRESENTED);
}
static void static void
meta_stage_x11_finalize (GObject *object) meta_stage_x11_finalize (GObject *object)
{ {
@ -503,6 +512,7 @@ clutter_stage_window_iface_init (ClutterStageWindowInterface *iface)
iface->unrealize = meta_stage_x11_unrealize; iface->unrealize = meta_stage_x11_unrealize;
iface->can_clip_redraws = meta_stage_x11_can_clip_redraws; iface->can_clip_redraws = meta_stage_x11_can_clip_redraws;
iface->get_views = meta_stage_x11_get_views; iface->get_views = meta_stage_x11_get_views;
iface->redraw_view = meta_stage_x11_redraw_view;
} }
static inline void static inline void