drm/bridge: tfp410: clear the EDID property on failures
authorJani Nikula <jani.nikula@intel.com>
Tue, 23 Jan 2024 19:37:17 +0000 (21:37 +0200)
committerJani Nikula <jani.nikula@intel.com>
Thu, 8 Feb 2024 15:12:26 +0000 (17:12 +0200)
If EDID read fails, clear the EDID property.

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/f49d95ce21e85495d73384acd184f4f9778368ee.1706038510.git.jani.nikula@intel.com
drivers/gpu/drm/bridge/ti-tfp410.c

index dd14731eb03e2272b21cdafd801676799391ba46..c7bef5c2392710dbe842778641aec7825f1b77ad 100644 (file)
@@ -61,6 +61,8 @@ static int tfp410_get_modes(struct drm_connector *connector)
                drm_edid = NULL;
        }
 
+       drm_edid_connector_update(connector, drm_edid);
+
        if (!drm_edid) {
                /*
                 * No EDID, fallback on the XGA standard modes and prefer a mode
@@ -71,8 +73,6 @@ static int tfp410_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);