From 6f58ac217a59b00c8c54d3d7159a8d4c127e3323 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michel=20D=C3=A4nzer?= Date: Wed, 6 Nov 2024 16:23:12 +0100 Subject: [PATCH] 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: af250506fbe8 ("kms/impl-device: Queue result when discarding submitted update") Part-of: (cherry picked from commit f8524159cc6b1980ae7e2d4894a7cab0d339fc67) --- src/backends/native/meta-onscreen-native.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/backends/native/meta-onscreen-native.c b/src/backends/native/meta-onscreen-native.c index 643c68972..bb24b70b6 100644 --- a/src/backends/native/meta-onscreen-native.c +++ b/src/backends/native/meta-onscreen-native.c @@ -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);