[PATCH 04/11] drm/exynos: hdmi: convert to struct drm_edid

[Jani Nikula]

Prefer the struct drm_edid based functions for reading the EDID and
updating the connector.

The functional change is that the CEC physical address gets invalidated
when the EDID could not be read.

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

---

Cc: Inki Dae <inki....@samsung.com>
Cc: Seung-Woo Kim <sw0312....@samsung.com>
Cc: Kyungmin Park <kyungmin.p...@samsung.com>
Cc: Krzysztof Kozlowski <k...@kernel.org>
Cc: Alim Akhtar <alim.akh...@samsung.com>
Cc: linux-arm-ker...@lists.infradead.org
Cc: linux-samsung-...@vger.kernel.org
---
 drivers/gpu/drm/exynos/exynos_hdmi.c | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c 
b/drivers/gpu/drm/exynos/exynos_hdmi.c
index e968824a4c72..9033e8b66816 100644
--- a/drivers/gpu/drm/exynos/exynos_hdmi.c
+++ b/drivers/gpu/drm/exynos/exynos_hdmi.c
@@ -883,27 +883,30 @@ static const struct drm_connector_funcs 
hdmi_connector_funcs = {
 static int hdmi_get_modes(struct drm_connector *connector)
 {
        struct hdmi_context *hdata = connector_to_hdmi(connector);
-       struct edid *edid;
+       const struct drm_display_info *info = &connector->display_info;
+       const struct drm_edid *drm_edid;
        int ret;
 
        if (!hdata->ddc_adpt)
                return 0;
 
-       edid = drm_get_edid(connector, hdata->ddc_adpt);
-       if (!edid)
+       drm_edid = drm_edid_read_ddc(connector, hdata->ddc_adpt);
+
+       drm_edid_connector_update(connector, drm_edid);
+
+       cec_notifier_set_phys_addr(hdata->notifier, 
info->source_physical_address);
+
+       if (!drm_edid)
                return 0;
 
-       hdata->dvi_mode = !connector->display_info.is_hdmi;
+       hdata->dvi_mode = !info->is_hdmi;
        DRM_DEV_DEBUG_KMS(hdata->dev, "%s : width[%d] x height[%d]\n",
                          (hdata->dvi_mode ? "dvi monitor" : "hdmi monitor"),
-                         edid->width_cm, edid->height_cm);
-
-       drm_connector_update_edid_property(connector, edid);
-       cec_notifier_set_phys_addr_from_edid(hdata->notifier, edid);
+                         info->width_mm / 10, info->height_mm / 10);
 
-       ret = drm_add_edid_modes(connector, edid);
+       ret = drm_edid_connector_add_modes(connector);
 
-       kfree(edid);
+       drm_edid_free(drm_edid);
 
        return ret;
 }
-- 
2.39.2