[PATCH v2 12/39] drm/meson: switch to drm_bridge_edid_read()

[Jani Nikula]

Prefer using the struct drm_edid based functions.

Not ideal, should use source physical address from connector info.

Signed-off-by: Jani Nikula <jani.nik...@intel.com>
---
 drivers/gpu/drm/meson/meson_encoder_hdmi.c | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/meson/meson_encoder_hdmi.c 
b/drivers/gpu/drm/meson/meson_encoder_hdmi.c
index 25ea76558690..fff6ce394f98 100644
--- a/drivers/gpu/drm/meson/meson_encoder_hdmi.c
+++ b/drivers/gpu/drm/meson/meson_encoder_hdmi.c
@@ -323,19 +323,31 @@ static void meson_encoder_hdmi_hpd_notify(struct 
drm_bridge *bridge,
                                          enum drm_connector_status status)
 {
        struct meson_encoder_hdmi *encoder_hdmi = 
bridge_to_meson_encoder_hdmi(bridge);
-       struct edid *edid;
 
        if (!encoder_hdmi->cec_notifier)
                return;
 
        if (status == connector_status_connected) {
-               edid = drm_bridge_get_edid(encoder_hdmi->next_bridge, 
encoder_hdmi->connector);
-               if (!edid)
+               const struct drm_edid *drm_edid;
+               const struct edid *edid;
+
+               drm_edid = drm_bridge_edid_read(encoder_hdmi->next_bridge,
+                                               encoder_hdmi->connector);
+               if (!drm_edid)
                        return;
 
+               /*
+                * FIXME: The CEC physical address should be set using
+                * cec_notifier_set_phys_addr(encoder_hdmi->cec_notifier,
+                * connector->display_info.source_physical_address) from a path
+                * that has read the EDID and called
+                * drm_edid_connector_update().
+                */
+               edid = drm_edid_raw(drm_edid);
+
                
cec_notifier_set_phys_addr_from_edid(encoder_hdmi->cec_notifier, edid);
 
-               kfree(edid);
+               drm_edid_free(drm_edid);
        } else
                cec_notifier_phys_addr_invalidate(encoder_hdmi->cec_notifier);
 }
-- 
2.39.2