From 71603c22fbc1f13f4dbc9b3bd1e94e289fbe989f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michel=20D=C3=A4nzer?= Date: Mon, 27 Jan 2025 11:52:04 +0100 Subject: [PATCH] kms/connector: Refactor edid_equal helper out of _state_changes No functional change intended. Part-of: --- src/backends/native/meta-kms-connector.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/backends/native/meta-kms-connector.c b/src/backends/native/meta-kms-connector.c index afd3d5e0f..338b037a4 100644 --- a/src/backends/native/meta-kms-connector.c +++ b/src/backends/native/meta-kms-connector.c @@ -895,6 +895,17 @@ meta_kms_connector_state_free (MetaKmsConnectorState *state) G_DEFINE_AUTOPTR_CLEANUP_FUNC (MetaKmsConnectorState, meta_kms_connector_state_free); +static gboolean +edid_equal (GBytes *old_edid, + GBytes *new_edid) +{ + if ((old_edid && !new_edid) || !new_edid || + !g_bytes_equal (old_edid, new_edid)) + return FALSE; + + return TRUE; +} + static gboolean kms_modes_equal (GList *modes, GList *other_modes) @@ -968,8 +979,7 @@ meta_kms_connector_state_changes (MetaKmsConnectorState *state, if (!meta_tile_info_equal (&state->tile_info, &new_state->tile_info)) return META_KMS_RESOURCE_CHANGE_FULL; - if ((state->edid_data && !new_state->edid_data) || !state->edid_data || - !g_bytes_equal (state->edid_data, new_state->edid_data)) + if (!edid_equal (state->edid_data, new_state->edid_data)) return META_KMS_RESOURCE_CHANGE_FULL; if (!kms_modes_equal (state->modes, new_state->modes))