From 3e3611d1712b353ac48c7ca4a1344301c91e4934 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=85dahl?= Date: Thu, 17 Jun 2021 21:11:44 +0200 Subject: [PATCH] kms/update: Stop tracking update sequence numbers They were only used for logging, and complicates things when updates can be merged. Since they aren't really useful, just remove it. Part-of: --- src/backends/native/meta-kms-impl-device-atomic.c | 7 ++----- src/backends/native/meta-kms-impl-device-simple.c | 4 +--- src/backends/native/meta-kms-update-private.h | 2 -- src/backends/native/meta-kms-update.c | 9 --------- 4 files changed, 3 insertions(+), 19 deletions(-) diff --git a/src/backends/native/meta-kms-impl-device-atomic.c b/src/backends/native/meta-kms-impl-device-atomic.c index 2980425b1..8e5b7207a 100644 --- a/src/backends/native/meta-kms-impl-device-atomic.c +++ b/src/backends/native/meta-kms-impl-device-atomic.c @@ -947,9 +947,7 @@ meta_kms_impl_device_atomic_process_update (MetaKmsImplDevice *impl_device, blob_ids = g_array_new (FALSE, TRUE, sizeof (uint32_t)); - meta_topic (META_DEBUG_KMS, - "[atomic] Processing update %" G_GUINT64_FORMAT, - meta_kms_update_get_sequence_number (update)); + meta_topic (META_DEBUG_KMS, "[atomic] Processing update"); req = drmModeAtomicAlloc (); if (!req) @@ -1018,8 +1016,7 @@ meta_kms_impl_device_atomic_process_update (MetaKmsImplDevice *impl_device, commit_flags |= DRM_MODE_ATOMIC_TEST_ONLY; meta_topic (META_DEBUG_KMS, - "[atomic] Committing update %" G_GUINT64_FORMAT ", flags: %s", - meta_kms_update_get_sequence_number (update), + "[atomic] Committing update flags: %s", commit_flags_string (commit_flags)); fd = meta_kms_impl_device_get_fd (impl_device); diff --git a/src/backends/native/meta-kms-impl-device-simple.c b/src/backends/native/meta-kms-impl-device-simple.c index 4e86cdc0f..199e39cae 100644 --- a/src/backends/native/meta-kms-impl-device-simple.c +++ b/src/backends/native/meta-kms-impl-device-simple.c @@ -1504,9 +1504,7 @@ meta_kms_impl_device_simple_process_update (MetaKmsImplDevice *impl_device, GError *error = NULL; GList *failed_planes = NULL; - meta_topic (META_DEBUG_KMS, - "[simple] Processing update %" G_GUINT64_FORMAT, - meta_kms_update_get_sequence_number (update)); + meta_topic (META_DEBUG_KMS, "[simple] Processing update"); if (flags & META_KMS_UPDATE_FLAG_TEST_ONLY) return perform_update_test (impl_device, update); diff --git a/src/backends/native/meta-kms-update-private.h b/src/backends/native/meta-kms-update-private.h index e7694126d..06c188d73 100644 --- a/src/backends/native/meta-kms-update-private.h +++ b/src/backends/native/meta-kms-update-private.h @@ -143,8 +143,6 @@ void meta_kms_update_unlock (MetaKmsUpdate *update); META_EXPORT_TEST gboolean meta_kms_update_is_locked (MetaKmsUpdate *update); -uint64_t meta_kms_update_get_sequence_number (MetaKmsUpdate *update); - META_EXPORT_TEST MetaKmsDevice * meta_kms_update_get_device (MetaKmsUpdate *update); diff --git a/src/backends/native/meta-kms-update.c b/src/backends/native/meta-kms-update.c index fe2dee8a3..a4fbef85e 100644 --- a/src/backends/native/meta-kms-update.c +++ b/src/backends/native/meta-kms-update.c @@ -33,7 +33,6 @@ struct _MetaKmsUpdate MetaKmsDevice *device; gboolean is_locked; - uint64_t sequence_number; GList *mode_sets; GList *plane_assignments; @@ -672,21 +671,13 @@ meta_kms_custom_page_flip_free (MetaKmsCustomPageFlip *custom_page_flip) g_free (custom_page_flip); } -uint64_t -meta_kms_update_get_sequence_number (MetaKmsUpdate *update) -{ - return update->sequence_number; -} - MetaKmsUpdate * meta_kms_update_new (MetaKmsDevice *device) { MetaKmsUpdate *update; - static uint64_t sequence_number = 0; update = g_new0 (MetaKmsUpdate, 1); update->device = device; - update->sequence_number = sequence_number++; return update; }