drm/bridge: lt8912b: use drm_bridge_edid_read()

[ Upstream commit 60d1fe1a7f302cc1151b155ac2d134db59bb1420 ]

Prefer using the struct drm_edid based functions.

cc: Adrien Grassein <adrien.grassein@gmail.com>
Cc: Andrzej Hajda <andrzej.hajda@intel.com>
Cc: Neil Armstrong <neil.armstrong@linaro.org>
Cc: Robert Foss <rfoss@kernel.org>
Cc: Laurent Pinchart <Laurent.pinchart@ideasonboard.com>
Cc: Jonas Karlman <jonas@kwiboo.se>
Cc: Jernej Skrabec <jernej.skrabec@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
Link: https://patchwork.freedesktop.org/patch/msgid/32c9b52fe6fa7cbad6bfd0ff00041876977e02ea.1706038510.git.jani.nikula@intel.com
Stable-dep-of: 171b711b26cc ("drm/bridge: lt8912b: do not return negative values from .get_modes()")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/gpu/drm/bridge/lontium-lt8912b.c b/drivers/gpu/drm/bridge/lontium-lt8912b.c
index 03532efb893bbc913f2a31a1f491849464a986f2..491c08306f81a0ca351e98633b25d6ad1393df3e 100644 (file)
--- a/drivers/gpu/drm/bridge/lontium-lt8912b.c
+++ b/drivers/gpu/drm/bridge/lontium-lt8912b.c
@@ -429,16 +429,16 @@ lt8912_connector_mode_valid(struct drm_connector *connector,
 
 static int lt8912_connector_get_modes(struct drm_connector *connector)
 {
-       struct edid *edid;
+       const struct drm_edid *drm_edid;
        int ret = -1;
        int num = 0;
        struct lt8912 *lt = connector_to_lt8912(connector);
        u32 bus_format = MEDIA_BUS_FMT_RGB888_1X24;
 
-       edid = drm_bridge_get_edid(lt->hdmi_port, connector);
-       if (edid) {
-               drm_connector_update_edid_property(connector, edid);
-               num = drm_add_edid_modes(connector, edid);
+       drm_edid = drm_bridge_edid_read(lt->hdmi_port, connector);
+       if (drm_edid) {
+               drm_edid_connector_update(connector, drm_edid);
+               num = drm_edid_connector_add_modes(connector);
        } else {
                return ret;
        }
@@ -448,7 +448,7 @@ static int lt8912_connector_get_modes(struct drm_connector *connector)
        if (ret)
                num = ret;
 
-       kfree(edid);
+       drm_edid_free(drm_edid);
        return num;
 }