drm/rockchip: inno_hdmi: switch to struct drm_edid

Prefer struct drm_edid based functions over struct edid.

Acked-by: Heiko Stuebner <heiko@sntech.de>
Link: https://patchwork.freedesktop.org/patch/msgid/1218cb4fd79149c90dc0c82c42ae0c8a36acf055.1713273659.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/drivers/gpu/drm/rockchip/inno_hdmi.c b/drivers/gpu/drm/rockchip/inno_hdmi.c
index 1d2261643743d85d583e433b1230caeb4eb70714..3df2cfcf999812c781b3723673c4c0684288a202 100644 (file)
--- a/drivers/gpu/drm/rockchip/inno_hdmi.c
+++ b/drivers/gpu/drm/rockchip/inno_hdmi.c
@@ -606,18 +606,16 @@ inno_hdmi_connector_detect(struct drm_connector *connector, bool force)
 static int inno_hdmi_connector_get_modes(struct drm_connector *connector)
 {
        struct inno_hdmi *hdmi = connector_to_inno_hdmi(connector);
-       struct edid *edid;
+       const struct drm_edid *drm_edid;
        int ret = 0;
 
        if (!hdmi->ddc)
                return 0;
 
-       edid = drm_get_edid(connector, hdmi->ddc);
-       if (edid) {
-               drm_connector_update_edid_property(connector, edid);
-               ret = drm_add_edid_modes(connector, edid);
-               kfree(edid);
-       }
+       drm_edid = drm_edid_read_ddc(connector, hdmi->ddc);
+       drm_edid_connector_update(connector, drm_edid);
+       ret = drm_edid_connector_add_modes(connector);
+       drm_edid_free(drm_edid);
 
        return ret;
 }