diff options
| author | Sebastian Wick <sebastian.wick@redhat.com> | 2023-03-02 01:59:41 +0100 |
|---|---|---|
| committer | Marge Bot <marge-bot@gnome.org> | 2023-03-04 09:30:41 +0000 |
| commit | 5984aa8137dd525149014f2628337d1d82da70bb (patch) | |
| tree | 12c5e0c005e300f6b031081c559c7e44066adf55 | |
| parent | 76e69f23758e5fe233018db783640124163bff7b (diff) | |
| download | mutter-5984aa8137dd525149014f2628337d1d82da70bb.tar.gz | |
backends/native: Let updates require ALLOW_MODESET
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2879>
| -rw-r--r-- | src/backends/native/meta-kms-impl-device-atomic.c | 2 | ||||
| -rw-r--r-- | src/backends/native/meta-kms-update-private.h | 2 | ||||
| -rw-r--r-- | src/backends/native/meta-kms-update.c | 8 |
3 files changed, 11 insertions, 1 deletions
diff --git a/src/backends/native/meta-kms-impl-device-atomic.c b/src/backends/native/meta-kms-impl-device-atomic.c index d44ca5f20..e0b2ce1dd 100644 --- a/src/backends/native/meta-kms-impl-device-atomic.c +++ b/src/backends/native/meta-kms-impl-device-atomic.c @@ -967,7 +967,7 @@ meta_kms_impl_device_atomic_process_update (MetaKmsImplDevice *impl_device, &error)) goto err; - if (meta_kms_update_get_mode_sets (update)) + if (meta_kms_update_get_needs_modeset (update)) commit_flags |= DRM_MODE_ATOMIC_ALLOW_MODESET; else commit_flags |= DRM_MODE_ATOMIC_NONBLOCK; diff --git a/src/backends/native/meta-kms-update-private.h b/src/backends/native/meta-kms-update-private.h index 0e91778e7..98a1b55d1 100644 --- a/src/backends/native/meta-kms-update-private.h +++ b/src/backends/native/meta-kms-update-private.h @@ -193,6 +193,8 @@ void meta_kms_custom_page_flip_free (MetaKmsCustomPageFlip *custom_page_flip); void meta_kms_update_realize (MetaKmsUpdate *update, MetaKmsImplDevice *impl_device); +gboolean meta_kms_update_get_needs_modeset (MetaKmsUpdate *update); + G_DEFINE_AUTOPTR_CLEANUP_FUNC (MetaKmsPlaneFeedback, meta_kms_plane_feedback_free) diff --git a/src/backends/native/meta-kms-update.c b/src/backends/native/meta-kms-update.c index f15ab3faa..4a4a3d692 100644 --- a/src/backends/native/meta-kms-update.c +++ b/src/backends/native/meta-kms-update.c @@ -46,6 +46,8 @@ struct _MetaKmsUpdate GList *page_flip_listeners; GList *result_listeners; + gboolean needs_modeset; + MetaKmsImplDevice *impl_device; }; @@ -953,6 +955,12 @@ meta_kms_update_merge_from (MetaKmsUpdate *update, merge_result_listeners_from (update, other_update); } +gboolean +meta_kms_update_get_needs_modeset (MetaKmsUpdate *update) +{ + return update->needs_modeset || update->mode_sets; +} + MetaKmsUpdate * meta_kms_update_new (MetaKmsDevice *device) { |