drm/rockchip: rk3066_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/56ee6b7c3c018df55f5fe48a3e6d705dbad5ef74.1713273659.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/drivers/gpu/drm/rockchip/rk3066_hdmi.c b/drivers/gpu/drm/rockchip/rk3066_hdmi.c
index 95cd1b49eda8a0c5c436caa9dfe5dca899776314..784de990da1b2c076a7067dcebb6c4a1273a5d5c 100644 (file)
--- a/drivers/gpu/drm/rockchip/rk3066_hdmi.c
+++ b/drivers/gpu/drm/rockchip/rk3066_hdmi.c
@@ -466,18 +466,16 @@ rk3066_hdmi_connector_detect(struct drm_connector *connector, bool force)
 static int rk3066_hdmi_connector_get_modes(struct drm_connector *connector)
 {
        struct rk3066_hdmi *hdmi = connector_to_rk3066_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;
 }