isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-02 04:40:43 -05:00
Code Issues Packages Projects Releases Wiki Activity

kms/impl-device: Reverse update merge order in process_mode_set_update

Browse Source 
This makes sure the new update takes effect over the pending update for
any common properties. It matches the other users of
meta_kms_update_merge_from.

Fixes: 27ed069766 ("kms/impl-device: Add deadline based KMS commit scheduling")
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3316>
This commit is contained in:
Michel Dänzer 2023-10-03 18:24:06 +02:00 committed by Marge Bot
parent 74b9d46d7c
commit 83b762e0e4
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/backends/native/meta-kms-impl-device.c
View File

@ -1597,8 +1597,9 @@ process_mode_set_update (MetaKmsImplDevice *impl_device,
if (!crtc_frame->pending_update) if (!crtc_frame->pending_update)
continue; continue;
meta_kms_update_merge_from (update, crtc_frame->pending_update); meta_kms_update_merge_from (crtc_frame->pending_update, update);
g_clear_pointer (&crtc_frame->pending_update, meta_kms_update_free); meta_kms_update_free (update);
update = g_steal_pointer (&crtc_frame->pending_update);
} }
g_hash_table_iter_init (&iter, priv->crtc_frames); g_hash_table_iter_init (&iter, priv->crtc_frames);