[PATCH 06/15] drm/sun4i: hdmi: switch to struct drm_edid

[Jani Nikula]

Prefer struct drm_edid based functions over struct edid.

Signed-off-by: Jani Nikula <jani.nik...@intel.com>

---

Cc: Maxime Ripard <mrip...@kernel.org>
Cc: Chen-Yu Tsai <w...@csie.org>
Cc: Jernej Skrabec <jernej.skra...@gmail.com>
Cc: Samuel Holland <sam...@sholland.org>
Cc: linux-arm-ker...@lists.infradead.org
Cc: linux-su...@lists.linux.dev
---
 drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c 
b/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c
index 2d1880c61b50..245b34adca5a 100644
--- 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;
 }
-- 
2.39.2