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

kms/update: Change 'seal' to 'lock'

Browse Source 
Sealing is a one way operation, but in the next commit, the "seal" will
be broken, so to avoid missusing the "seal" terminology, rename related
methods and variables to use the term "lock" instead. E.g.
meta_update_is_sealed() is now meta_update_is_locked().

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1488>
This commit is contained in:
Jonas Ådahl 2021-01-07 19:44:51 +01:00 committed by Marge Bot
parent 4f89f159ca
commit 8876b217af
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/backends/native/meta-kms-update-private.h
View File

@ -110,9 +110,9 @@ MetaKmsFeedback * meta_kms_feedback_new_passed (GList *failed_planes);
MetaKmsFeedback * meta_kms_feedback_new_failed (GList *failed_planes, MetaKmsFeedback * meta_kms_feedback_new_failed (GList *failed_planes,
GError *error); GError *error);
void meta_kms_update_seal (MetaKmsUpdate *update); void meta_kms_update_lock (MetaKmsUpdate *update);
gboolean meta_kms_update_is_sealed (MetaKmsUpdate *update); gboolean meta_kms_update_is_locked (MetaKmsUpdate *update);
MetaKmsDevice * meta_kms_update_get_device (MetaKmsUpdate *update); MetaKmsDevice * meta_kms_update_get_device (MetaKmsUpdate *update);

30
src/backends/native/meta-kms-update.c
View File

@ -32,7 +32,7 @@ struct _MetaKmsUpdate
{ {
MetaKmsDevice *device; MetaKmsDevice *device;
gboolean is_sealed; gboolean is_locked;
MetaPowerSave power_save; MetaPowerSave power_save;
GList *mode_sets; GList *mode_sets;
@ -152,7 +152,7 @@ meta_kms_update_assign_plane (MetaKmsUpdate *update,
{ {
MetaKmsPlaneAssignment *plane_assignment; MetaKmsPlaneAssignment *plane_assignment;
g_assert (!meta_kms_update_is_sealed (update)); g_assert (!meta_kms_update_is_locked (update));
g_assert (meta_kms_crtc_get_device (crtc) == update->device); g_assert (meta_kms_crtc_get_device (crtc) == update->device);
g_assert (meta_kms_plane_get_device (plane) == update->device); g_assert (meta_kms_plane_get_device (plane) == update->device);
g_assert (meta_kms_plane_get_plane_type (plane) != g_assert (meta_kms_plane_get_plane_type (plane) !=
@ -183,7 +183,7 @@ meta_kms_update_unassign_plane (MetaKmsUpdate *update,
{ {
MetaKmsPlaneAssignment *plane_assignment; MetaKmsPlaneAssignment *plane_assignment;
g_assert (!meta_kms_update_is_sealed (update)); g_assert (!meta_kms_update_is_locked (update));
g_assert (meta_kms_crtc_get_device (crtc) == update->device); g_assert (meta_kms_crtc_get_device (crtc) == update->device);
g_assert (meta_kms_plane_get_device (plane) == update->device); g_assert (meta_kms_plane_get_device (plane) == update->device);
@ -209,7 +209,7 @@ meta_kms_update_mode_set (MetaKmsUpdate *update,
{ {
MetaKmsModeSet *mode_set; MetaKmsModeSet *mode_set;
g_assert (!meta_kms_update_is_sealed (update)); g_assert (!meta_kms_update_is_locked (update));
g_assert (meta_kms_crtc_get_device (crtc) == update->device); g_assert (meta_kms_crtc_get_device (crtc) == update->device);
mode_set = g_new0 (MetaKmsModeSet, 1); mode_set = g_new0 (MetaKmsModeSet, 1);
@ -254,7 +254,7 @@ meta_kms_update_set_underscanning (MetaKmsUpdate *update,
{ {
MetaKmsConnectorUpdate *connector_update; MetaKmsConnectorUpdate *connector_update;
g_assert (!meta_kms_update_is_sealed (update)); g_assert (!meta_kms_update_is_locked (update));
g_assert (meta_kms_connector_get_device (connector) == update->device); g_assert (meta_kms_connector_get_device (connector) == update->device);
connector_update = ensure_connector_update (update, connector); connector_update = ensure_connector_update (update, connector);
@ -270,7 +270,7 @@ meta_kms_update_unset_underscanning (MetaKmsUpdate *update,
{ {
MetaKmsConnectorUpdate *connector_update; MetaKmsConnectorUpdate *connector_update;
g_assert (!meta_kms_update_is_sealed (update)); g_assert (!meta_kms_update_is_locked (update));
g_assert (meta_kms_connector_get_device (connector) == update->device); g_assert (meta_kms_connector_get_device (connector) == update->device);
connector_update = ensure_connector_update (update, connector); connector_update = ensure_connector_update (update, connector);
@ -285,7 +285,7 @@ meta_kms_update_set_dpms_state (MetaKmsUpdate *update,
{ {
MetaKmsConnectorUpdate *connector_update; MetaKmsConnectorUpdate *connector_update;
g_assert (!meta_kms_update_is_sealed (update)); g_assert (!meta_kms_update_is_locked (update));
g_assert (meta_kms_connector_get_device (connector) == update->device); g_assert (meta_kms_connector_get_device (connector) == update->device);
connector_update = ensure_connector_update (update, connector); connector_update = ensure_connector_update (update, connector);
@ -312,7 +312,7 @@ meta_kms_update_set_crtc_gamma (MetaKmsUpdate *update,
{ {
MetaKmsCrtcGamma *gamma; MetaKmsCrtcGamma *gamma;
g_assert (!meta_kms_update_is_sealed (update)); g_assert (!meta_kms_update_is_locked (update));
g_assert (meta_kms_crtc_get_device (crtc) == update->device); g_assert (meta_kms_crtc_get_device (crtc) == update->device);
gamma = g_new0 (MetaKmsCrtcGamma, 1); gamma = g_new0 (MetaKmsCrtcGamma, 1);
@ -335,7 +335,7 @@ meta_kms_update_add_page_flip_listener (MetaKmsUpdate *upd
{ {
MetaKmsPageFlipListener *listener; MetaKmsPageFlipListener *listener;
g_assert (!meta_kms_update_is_sealed (update)); g_assert (!meta_kms_update_is_locked (update));
g_assert (meta_kms_crtc_get_device (crtc) == update->device); g_assert (meta_kms_crtc_get_device (crtc) == update->device);
listener = g_new0 (MetaKmsPageFlipListener, 1); listener = g_new0 (MetaKmsPageFlipListener, 1);
@ -354,7 +354,7 @@ meta_kms_update_set_custom_page_flip (MetaKmsUpdate *update,
MetaKmsCustomPageFlipFunc func, MetaKmsCustomPageFlipFunc func,
gpointer user_data) gpointer user_data)
{ {
g_assert (!meta_kms_update_is_sealed (update)); g_assert (!meta_kms_update_is_locked (update));
update->custom_page_flip_func = func; update->custom_page_flip_func = func;
update->custom_page_flip_user_data = user_data; update->custom_page_flip_user_data = user_data;
@ -364,7 +364,7 @@ void
meta_kms_plane_assignment_set_rotation (MetaKmsPlaneAssignment *plane_assignment, meta_kms_plane_assignment_set_rotation (MetaKmsPlaneAssignment *plane_assignment,
uint64_t rotation) uint64_t rotation)
{ {
g_assert (!meta_kms_update_is_sealed (plane_assignment->update)); g_assert (!meta_kms_update_is_locked (plane_assignment->update));
g_warn_if_fail (rotation); g_warn_if_fail (rotation);
plane_assignment->rotation = rotation; plane_assignment->rotation = rotation;
@ -464,15 +464,15 @@ meta_kms_update_get_crtc_gammas (MetaKmsUpdate *update)
} }
void void
meta_kms_update_seal (MetaKmsUpdate *update) meta_kms_update_lock (MetaKmsUpdate *update)
{ {
update->is_sealed = TRUE; update->is_locked = TRUE;
} }
gboolean gboolean
meta_kms_update_is_sealed (MetaKmsUpdate *update) meta_kms_update_is_locked (MetaKmsUpdate *update)
{ {
return update->is_sealed; return update->is_locked;
} }
MetaKmsDevice * MetaKmsDevice *

2
src/backends/native/meta-kms.c
View File

@ -261,7 +261,7 @@ meta_kms_post_pending_update_sync (MetaKms *kms,
if (!update) if (!update)
return NULL; return NULL;
meta_kms_update_seal (update); meta_kms_update_lock (update);
feedback = meta_kms_run_impl_task_sync (kms, feedback = meta_kms_run_impl_task_sync (kms,
meta_kms_process_update_in_impl, meta_kms_process_update_in_impl,