drm/vc4: Use the new helpers

We just introduced new helpers, so let's use them.

Signed-off-by: Maxime Ripard <maxime@cerno.tech>

diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
index f9eb6a5..507eff9 100644 (file)
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
@@ -527,21 +527,6 @@ static int vc4_hdmi_connector_get_modes(struct drm_connector *connector)
        return ret;
 }
 
-static bool hdr_metadata_equal(const struct drm_connector_state *old_state,
-                              const struct drm_connector_state *new_state)
-{
-       struct drm_property_blob *old_blob = old_state->hdr_output_metadata;
-       struct drm_property_blob *new_blob = new_state->hdr_output_metadata;
-
-       if (!old_blob || !new_blob)
-               return old_blob == new_blob;
-
-       if (old_blob->length != new_blob->length)
-               return false;
-
-       return !memcmp(old_blob->data, new_blob->data, old_blob->length);
-}
-
 static int vc4_hdmi_connector_atomic_check(struct drm_connector *connector,
                                          struct drm_atomic_state *state)
 {
@@ -550,12 +535,13 @@ static int vc4_hdmi_connector_atomic_check(struct drm_connector *connector,
        struct drm_connector_state *new_state =
                drm_atomic_get_new_connector_state(state, connector);
        struct drm_crtc *crtc = new_state->crtc;
-       struct drm_crtc_state *crtc_state;
 
        if (!crtc)
                return 0;
 
-       if (!hdr_metadata_equal(old_state, new_state)) {
+       if (!drm_connector_atomic_hdr_metadata_equal(old_state, new_state)) {
+               struct drm_crtc_state *crtc_state;
+
                crtc_state = drm_atomic_get_crtc_state(state, crtc);
                if (IS_ERR(crtc_state))
                        return PTR_ERR(crtc_state);
@@ -654,8 +640,7 @@ static int vc4_hdmi_connector_init(struct drm_device *dev,
        connector->stereo_allowed = 1;
 
        if (vc4_hdmi->variant->supports_hdr)
-               drm_object_attach_property(&connector->base,
-                       connector->dev->mode_config.hdr_output_metadata_property, 0);
+               drm_connector_attach_hdr_output_metadata_property(connector);
 
        drm_connector_attach_encoder(connector, encoder);