Merge tag 'drm-intel-next-2021-05-19-1' of git://anongit.freedesktop.org/drm/drm...

[linux-2.6-microblaze.git] / drivers / gpu / drm / i915 / display / intel_atomic.c

diff --git a/drivers/gpu/drm/i915/display/intel_atomic.c b/drivers/gpu/drm/i915/display/intel_atomic.c
index 45feaad..88f4240 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_atomic.c
+++ b/drivers/gpu/drm/i915/display/intel_atomic.c
@@ -109,16 +109,6 @@ int intel_digital_connector_atomic_set_property(struct drm_connector *connector,
        return -EINVAL;
 }
 
-static bool blob_equal(const struct drm_property_blob *a,
-                      const struct drm_property_blob *b)
-{
-       if (a && b)
-               return a->length == b->length &&
-                       !memcmp(a->data, b->data, a->length);
-
-       return !a == !b;
-}
-
 int intel_digital_connector_atomic_check(struct drm_connector *conn,
                                         struct drm_atomic_state *state)
 {
@@ -149,8 +139,7 @@ int intel_digital_connector_atomic_check(struct drm_connector *conn,
            new_conn_state->base.picture_aspect_ratio != old_conn_state->base.picture_aspect_ratio ||
            new_conn_state->base.content_type != old_conn_state->base.content_type ||
            new_conn_state->base.scaling_mode != old_conn_state->base.scaling_mode ||
-           !blob_equal(new_conn_state->base.hdr_output_metadata,
-                       old_conn_state->base.hdr_output_metadata))
+           !drm_connector_atomic_hdr_metadata_equal(old_state, new_state))
                crtc_state->mode_changed = true;
 
        return 0;