diff options
| author | Jonas Ådahl <jadahl@gmail.com> | 2022-10-20 22:08:07 +0200 |
|---|---|---|
| committer | Marge Bot <marge-bot@gnome.org> | 2023-03-01 23:57:32 +0000 |
| commit | 5dbd9cc1b8e814515182011b11eb367541ac7afa (patch) | |
| tree | 4bdbdbea46f550fedd1fac45efb9be751c7c7017 | |
| parent | b1b9a9aac19864a2fe949d025c7c36b6231686f0 (diff) | |
| download | mutter-5dbd9cc1b8e814515182011b11eb367541ac7afa.tar.gz | |
onscreen/native: Process TEST_ONLY updates directly on the device
No point in going via a thin meta_kms_* wrapper.
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2854>
| -rw-r--r-- | src/backends/native/meta-kms.c | 15 | ||||
| -rw-r--r-- | src/backends/native/meta-kms.h | 3 | ||||
| -rw-r--r-- | src/backends/native/meta-onscreen-native.c | 6 |
3 files changed, 3 insertions, 21 deletions
diff --git a/src/backends/native/meta-kms.c b/src/backends/native/meta-kms.c index 96e81cebe..fc578ec83 100644 --- a/src/backends/native/meta-kms.c +++ b/src/backends/native/meta-kms.c @@ -282,21 +282,6 @@ meta_kms_post_pending_update_sync (MetaKms *kms, return feedback; } -MetaKmsFeedback * -meta_kms_post_test_update_sync (MetaKms *kms, - MetaKmsUpdate *update) -{ - MetaKmsDevice *device = meta_kms_update_get_device (update); - MetaKmsUpdateFlag flags; - - g_assert (!meta_kms_update_get_page_flip_listeners (update)); - g_assert (!meta_kms_update_get_mode_sets (update)); - g_assert (!meta_kms_update_get_connector_updates (update)); - - flags = META_KMS_UPDATE_FLAG_TEST_ONLY; - return meta_kms_device_process_update_sync (device, update, flags); -} - static gpointer meta_kms_discard_pending_page_flips_in_impl (MetaKmsImpl *impl, gpointer user_data, diff --git a/src/backends/native/meta-kms.h b/src/backends/native/meta-kms.h index 9bfc866aa..5b30d0ddf 100644 --- a/src/backends/native/meta-kms.h +++ b/src/backends/native/meta-kms.h @@ -46,9 +46,6 @@ MetaKmsFeedback * meta_kms_post_pending_update_sync (MetaKms *kms, MetaKmsDevice *device, MetaKmsUpdateFlag flags); -MetaKmsFeedback * meta_kms_post_test_update_sync (MetaKms *kms, - MetaKmsUpdate *update); - void meta_kms_discard_pending_page_flips (MetaKms *kms); void meta_kms_notify_modes_set (MetaKms *kms); diff --git a/src/backends/native/meta-onscreen-native.c b/src/backends/native/meta-onscreen-native.c index d7979d1fa..bf2469d99 100644 --- a/src/backends/native/meta-onscreen-native.c +++ b/src/backends/native/meta-onscreen-native.c @@ -1241,7 +1241,6 @@ meta_onscreen_native_is_buffer_scanout_compatible (CoglOnscreen *onscreen, MetaGpuKms *gpu_kms; MetaKmsDevice *kms_device; MetaKmsCrtc *kms_crtc; - MetaKms *kms; MetaKmsUpdate *test_update; g_autoptr (MetaKmsFeedback) kms_feedback = NULL; MetaKmsFeedbackResult result; @@ -1249,7 +1248,6 @@ meta_onscreen_native_is_buffer_scanout_compatible (CoglOnscreen *onscreen, gpu_kms = META_GPU_KMS (meta_crtc_get_gpu (crtc)); kms_device = meta_gpu_kms_get_kms_device (gpu_kms); kms_crtc = meta_crtc_kms_get_kms_crtc (crtc_kms); - kms = meta_kms_device_get_kms (kms_device); test_update = meta_kms_update_new (kms_device); meta_crtc_kms_assign_primary_plane (crtc_kms, fb, test_update); @@ -1259,7 +1257,9 @@ meta_onscreen_native_is_buffer_scanout_compatible (CoglOnscreen *onscreen, meta_kms_crtc_get_id (kms_crtc), meta_kms_device_get_path (kms_device)); - kms_feedback = meta_kms_post_test_update_sync (kms, test_update); + kms_feedback = + meta_kms_device_process_update_sync (kms_device, test_update, + META_KMS_UPDATE_FLAG_TEST_ONLY); meta_kms_update_free (test_update); result = meta_kms_feedback_get_result (kms_feedback); |