drm/mediatek/hdmi: switch to ->edid_read callback

Prefer using the struct drm_edid based callback and functions.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
Link: https://patchwork.freedesktop.org/patch/msgid/7fff7a6ff6b7e6f121eafaccfc4c368e492631f4.1706038510.git.jani.nikula@intel.com

diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi.c b/drivers/gpu/drm/mediatek/mtk_hdmi.c
index 86133bf16326b1c42c2ac9bbf4447e925c860536..c6bdc565e4a90ee481315f4c59548ae17357645f 100644 (file)
--- a/drivers/gpu/drm/mediatek/mtk_hdmi.c
+++ b/drivers/gpu/drm/mediatek/mtk_hdmi.c
@@ -1265,19 +1265,27 @@ static enum drm_connector_status mtk_hdmi_bridge_detect(struct drm_bridge *bridg
        return mtk_hdmi_detect(hdmi);
 }
 
-static struct edid *mtk_hdmi_bridge_get_edid(struct drm_bridge *bridge,
-                                            struct drm_connector *connector)
+static const struct drm_edid *mtk_hdmi_bridge_edid_read(struct drm_bridge *bridge,
+                                                       struct drm_connector *connector)
 {
        struct mtk_hdmi *hdmi = hdmi_ctx_from_bridge(bridge);
-       struct edid *edid;
+       const struct drm_edid *drm_edid;
 
        if (!hdmi->ddc_adpt)
                return NULL;
-       edid = drm_get_edid(connector, hdmi->ddc_adpt);
-       if (!edid)
-               return NULL;
-       hdmi->dvi_mode = !drm_detect_monitor_audio(edid);
-       return edid;
+       drm_edid = drm_edid_read_ddc(connector, hdmi->ddc_adpt);
+       if (drm_edid) {
+               /*
+                * FIXME: This should use !connector->display_info.has_audio (or
+                * !connector->display_info.is_hdmi) from a path that has read
+                * the EDID and called drm_edid_connector_update().
+                */
+               const struct edid *edid = drm_edid_raw(drm_edid);
+
+               hdmi->dvi_mode = !drm_detect_monitor_audio(edid);
+       }
+
+       return drm_edid;
 }
 
 static int mtk_hdmi_bridge_attach(struct drm_bridge *bridge,
@@ -1417,7 +1425,7 @@ static const struct drm_bridge_funcs mtk_hdmi_bridge_funcs = {
        .atomic_pre_enable = mtk_hdmi_bridge_atomic_pre_enable,
        .atomic_enable = mtk_hdmi_bridge_atomic_enable,
        .detect = mtk_hdmi_bridge_detect,
-       .get_edid = mtk_hdmi_bridge_get_edid,
+       .edid_read = mtk_hdmi_bridge_edid_read,
 };
 
 static int mtk_hdmi_dt_parse_pdata(struct mtk_hdmi *hdmi,