As of commit 5186421cbfe2 ("drm: Introduce epoch counter to
drm_connector") the drm_get_edid() function calls
drm_connector_update_edid_property() for us. There's no reason for us
to call it again.

Signed-off-by: Douglas Anderson <diand...@chromium.org>
Reviewed-by: Andrzej Hajda <a.ha...@samsung.com>
---

(no changes since v1)

 drivers/gpu/drm/bridge/ti-sn65dsi86.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/drivers/gpu/drm/bridge/ti-sn65dsi86.c 
b/drivers/gpu/drm/bridge/ti-sn65dsi86.c
index 51db30d573c1..6390bc58f29a 100644
--- a/drivers/gpu/drm/bridge/ti-sn65dsi86.c
+++ b/drivers/gpu/drm/bridge/ti-sn65dsi86.c
@@ -270,7 +270,7 @@ static int ti_sn_bridge_connector_get_modes(struct 
drm_connector *connector)
 {
        struct ti_sn_bridge *pdata = connector_to_ti_sn_bridge(connector);
        struct edid *edid = pdata->edid;
-       int num, ret;
+       int num;
 
        if (!edid) {
                pm_runtime_get_sync(pdata->dev);
@@ -279,12 +279,9 @@ static int ti_sn_bridge_connector_get_modes(struct 
drm_connector *connector)
        }
 
        if (edid && drm_edid_is_valid(edid)) {
-               ret = drm_connector_update_edid_property(connector, edid);
-               if (!ret) {
-                       num = drm_add_edid_modes(connector, edid);
-                       if (num)
-                               return num;
-               }
+               num = drm_add_edid_modes(connector, edid);
+               if (num)
+                       return num;
        }
 
        return drm_panel_get_modes(pdata->panel, connector);
-- 
2.31.0.208.g409f899ff0-goog

Reply via email to