1
0
Fork 0

onscreen/native: Move discarded KMS update handling

To swap_buffer_result_feedback from page_flip_feedback_discarded. The
former is where META_KMS_ERROR_DISCARDED from disarm_all_frame_sources
gets handled here.

Fixes: af250506fb ("kms/impl-device: Queue result when discarding submitted update")
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3964>
(cherry picked from commit f8524159cc6b1980ae7e2d4894a7cab0d339fc67)
This commit is contained in:
Michel Dänzer 2024-11-06 16:23:12 +01:00 committed by Jonas Ådahl
parent dfec672752
commit 6f58ac217a

View file

@ -344,10 +344,7 @@ page_flip_feedback_discarded (MetaKmsCrtc *kms_crtc,
if (error &&
!g_error_matches (error,
G_IO_ERROR,
G_IO_ERROR_PERMISSION_DENIED) &&
!g_error_matches (error,
META_KMS_ERROR,
META_KMS_ERROR_DISCARDED))
G_IO_ERROR_PERMISSION_DENIED))
g_warning ("Page flip discarded: %s", error->message);
@ -1336,6 +1333,9 @@ swap_buffer_result_feedback (const MetaKmsFeedback *kms_feedback,
return;
if (!g_error_matches (error,
META_KMS_ERROR,
META_KMS_ERROR_DISCARDED) &&
!g_error_matches (error,
G_IO_ERROR,
G_IO_ERROR_PERMISSION_DENIED))
g_warning ("Page flip failed: %s", error->message);