From 315dfaa5d4eca961e91b6b26b8a4d08a2938e4d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michel=20D=C3=A4nzer?= Date: Tue, 12 Nov 2024 19:10:51 +0100 Subject: [PATCH] kms/impl-device: Simplify meta_kms_impl_device_schedule_process logic MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There's no need for a label. No functional change intended. v2: * Keep early returns separate. (Jonas Ådahl) Part-of: --- src/backends/native/meta-kms-impl-device.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/src/backends/native/meta-kms-impl-device.c b/src/backends/native/meta-kms-impl-device.c index bfadf1e72..06e689f14 100644 --- a/src/backends/native/meta-kms-impl-device.c +++ b/src/backends/native/meta-kms-impl-device.c @@ -2024,23 +2024,21 @@ meta_kms_impl_device_schedule_process (MetaKmsImplDevice *impl_device, MetaKmsCrtc *crtc) { CrtcFrame *crtc_frame; - g_autoptr (GError) error = NULL; crtc_frame = ensure_crtc_frame (impl_device, crtc); if (crtc_frame->await_flush) return; - if (!is_using_deadline_timer (impl_device)) - goto needs_flush; + if (is_using_deadline_timer (impl_device)) + { + if (crtc_frame->pending_page_flip) + return; - if (crtc_frame->pending_page_flip) - return; + if (ensure_deadline_timer_armed (impl_device, crtc_frame)) + return; + } - if (ensure_deadline_timer_armed (impl_device, crtc_frame)) - return; - -needs_flush: meta_kms_device_set_needs_flush (meta_kms_crtc_get_device (crtc), crtc); }