From 452e4fbf70b65e449346458afa413b273ad9ec14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michel=20D=C3=A4nzer?= Date: Mon, 19 Aug 2024 17:55:06 +0200 Subject: [PATCH] kms/plane: Rename META_KMS_ASSIGN_PLANE_FLAG_DIRECT_SCANOUT To META_KMS_ASSIGN_PLANE_FLAG_DISABLE_IMPLICIT_SYNC. This describes the effect of the flag, instead of the circumstances it's currently used for. Part-of: --- src/backends/native/meta-kms-impl-device-atomic.c | 2 +- src/backends/native/meta-kms-update.h | 2 +- src/backends/native/meta-onscreen-native.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/backends/native/meta-kms-impl-device-atomic.c b/src/backends/native/meta-kms-impl-device-atomic.c index a4ffd70b6..b748ca338 100644 --- a/src/backends/native/meta-kms-impl-device-atomic.c +++ b/src/backends/native/meta-kms-impl-device-atomic.c @@ -643,7 +643,7 @@ process_plane_assignment (MetaKmsImplDevice *impl_device, return FALSE; } - if (plane_assignment->flags & META_KMS_ASSIGN_PLANE_FLAG_DIRECT_SCANOUT) + if (plane_assignment->flags & META_KMS_ASSIGN_PLANE_FLAG_DISABLE_IMPLICIT_SYNC) { int signaled_sync_file; diff --git a/src/backends/native/meta-kms-update.h b/src/backends/native/meta-kms-update.h index 437989d7b..b74adbde2 100644 --- a/src/backends/native/meta-kms-update.h +++ b/src/backends/native/meta-kms-update.h @@ -39,7 +39,7 @@ typedef enum _MetaKmsAssignPlaneFlag META_KMS_ASSIGN_PLANE_FLAG_NONE = 0, META_KMS_ASSIGN_PLANE_FLAG_FB_UNCHANGED = 1 << 0, META_KMS_ASSIGN_PLANE_FLAG_ALLOW_FAIL = 1 << 1, - META_KMS_ASSIGN_PLANE_FLAG_DIRECT_SCANOUT = 1 << 2, + META_KMS_ASSIGN_PLANE_FLAG_DISABLE_IMPLICIT_SYNC = 1 << 2, } MetaKmsAssignPlaneFlag; struct _MetaKmsPageFlipListenerVtable diff --git a/src/backends/native/meta-onscreen-native.c b/src/backends/native/meta-onscreen-native.c index 229aed375..b41beb216 100644 --- a/src/backends/native/meta-onscreen-native.c +++ b/src/backends/native/meta-onscreen-native.c @@ -1539,7 +1539,7 @@ meta_onscreen_native_is_buffer_scanout_compatible (CoglOnscreen *onscreen, assign_primary_plane (crtc_kms, buffer, test_update, - META_KMS_ASSIGN_PLANE_FLAG_DIRECT_SCANOUT, + META_KMS_ASSIGN_PLANE_FLAG_DISABLE_IMPLICIT_SYNC, &src_rect, &dst_rect); @@ -1674,7 +1674,7 @@ meta_onscreen_native_direct_scanout (CoglOnscreen *onscreen, onscreen_native->view, onscreen_native->crtc, kms_update, - META_KMS_ASSIGN_PLANE_FLAG_DIRECT_SCANOUT, + META_KMS_ASSIGN_PLANE_FLAG_DISABLE_IMPLICIT_SYNC, NULL, 0);