drm/sun4i: hdmi: switch to struct drm_edid

Prefer struct drm_edid based functions over struct edid.

Acked-by: Maxime Ripard <mripard@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/0967dde8ae35cd58ab8ea58397d514bb9df29fd1.1713273659.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c b/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c
index 2d1880c61b50d1316c3119c0d2fa2ac733d3396b..245b34adca5af7c107b9e3e4827226195550f7e3 100644 (file)
--- a/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c
+++ b/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c
@@ -214,20 +214,24 @@ sun4i_hdmi_connector_mode_valid(struct drm_connector *connector,
 static int sun4i_hdmi_get_modes(struct drm_connector *connector)
 {
        struct sun4i_hdmi *hdmi = drm_connector_to_sun4i_hdmi(connector);
-       struct edid *edid;
+       const struct drm_edid *drm_edid;
        int ret;
 
-       edid = drm_get_edid(connector, hdmi->ddc_i2c ?: hdmi->i2c);
-       if (!edid)
+       drm_edid = drm_edid_read_ddc(connector, hdmi->ddc_i2c ?: hdmi->i2c);
+
+       drm_edid_connector_update(connector, drm_edid);
+       cec_s_phys_addr(hdmi->cec_adap,
+                       connector->display_info.source_physical_address, false);
+
+       if (!drm_edid)
                return 0;
 
        DRM_DEBUG_DRIVER("Monitor is %s monitor\n",
                         connector->display_info.is_hdmi ? "an HDMI" : "a DVI");
 
-       drm_connector_update_edid_property(connector, edid);
-       cec_s_phys_addr_from_edid(hdmi->cec_adap, edid);
-       ret = drm_add_edid_modes(connector, edid);
-       kfree(edid);
+
+       ret = drm_edid_connector_add_modes(connector);
+       drm_edid_free(drm_edid);
 
        return ret;
 }