From: Jani Nikula Date: Tue, 16 Apr 2024 13:22:28 +0000 (+0300) Subject: drm/rockchip: inno_hdmi: switch to struct drm_edid X-Git-Tag: io_uring-6.10-20240523~68^2~15^2~38 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=7fa1d6c50a5f5ad140bca0c615e97221f042a7a5;p=linux-2.6-block.git drm/rockchip: inno_hdmi: switch to struct drm_edid Prefer struct drm_edid based functions over struct edid. Acked-by: Heiko Stuebner Link: https://patchwork.freedesktop.org/patch/msgid/1218cb4fd79149c90dc0c82c42ae0c8a36acf055.1713273659.git.jani.nikula@intel.com Signed-off-by: Jani Nikula --- diff --git a/drivers/gpu/drm/rockchip/inno_hdmi.c b/drivers/gpu/drm/rockchip/inno_hdmi.c index 1d2261643743..3df2cfcf9998 100644 --- 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; }