If EDID read fails, clear the EDID property.

Cc: Andrzej Hajda <andrzej.ha...@intel.com>
Cc: Neil Armstrong <neil.armstr...@linaro.org>
Cc: Robert Foss <rf...@kernel.org>
Cc: Laurent Pinchart <laurent.pinch...@ideasonboard.com>
Cc: Jonas Karlman <jo...@kwiboo.se>
Cc: Jernej Skrabec <jernej.skra...@gmail.com>
Signed-off-by: Jani Nikula <jani.nik...@intel.com>
---
 drivers/gpu/drm/bridge/simple-bridge.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/bridge/simple-bridge.c 
b/drivers/gpu/drm/bridge/simple-bridge.c
index e0cf7721bb8c..5813a2c4fc5e 100644
--- a/drivers/gpu/drm/bridge/simple-bridge.c
+++ b/drivers/gpu/drm/bridge/simple-bridge.c
@@ -62,6 +62,8 @@ static int simple_bridge_get_modes(struct drm_connector 
*connector)
                drm_edid = NULL;
        }
 
+       drm_edid_connector_update(connector, drm_edid);
+
        if (!drm_edid) {
                /*
                 * In case we cannot retrieve the EDIDs (missing or broken DDC
@@ -73,7 +75,6 @@ static int simple_bridge_get_modes(struct drm_connector 
*connector)
                return ret;
        }
 
-       drm_edid_connector_update(connector, drm_edid);
        ret = drm_edid_connector_add_modes(connector);
        drm_edid_free(drm_edid);
 
-- 
2.39.2

Reply via email to