drm/bridge: cdns-mhdp8546: clear the EDID property on failures
authorJani Nikula <jani.nikula@intel.com>
Tue, 23 Jan 2024 19:37:22 +0000 (21:37 +0200)
committerJani Nikula <jani.nikula@intel.com>
Fri, 9 Feb 2024 08:15:27 +0000 (10:15 +0200)
If EDID read fails, clear the EDID property.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
Link: https://patchwork.freedesktop.org/patch/msgid/a754d9f90fe2addb9d90f9638e3d53dce87bdabc.1706038510.git.jani.nikula@intel.com
drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c

index e44cb89c33f02be2735069b7b7d4621a00f50e7f..e226acc5c15e1fbed2282b04ef0d39e27a5dc4ae 100644 (file)
@@ -1524,12 +1524,14 @@ static int cdns_mhdp_get_modes(struct drm_connector *connector)
                return 0;
 
        drm_edid = cdns_mhdp_edid_read(mhdp, connector);
+
+       drm_edid_connector_update(connector, drm_edid);
+
        if (!drm_edid) {
                dev_err(mhdp->dev, "Failed to read EDID\n");
                return 0;
        }
 
-       drm_edid_connector_update(connector, drm_edid);
        num_modes = drm_edid_connector_add_modes(connector);
        drm_edid_free(drm_edid);