summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJani Nikula <jani.nikula@intel.com>2024-01-23 22:37:22 +0300
committerJani Nikula <jani.nikula@intel.com>2024-02-09 11:15:27 +0300
commit1b48b6c41ffca2c549826241e65fc226a479ae44 (patch)
tree7380a2a7443b3d3b7a985f30a21ef57fce6a3c85
parent9da5f1048db1e0080048682f086957fc897b3b48 (diff)
downloadlinux-1b48b6c41ffca2c549826241e65fc226a479ae44.tar.xz
drm/bridge: cdns-mhdp8546: clear the EDID property on failures
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
-rw-r--r--drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c b/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c
index e44cb89c33f0..e226acc5c15e 100644
--- a/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c
+++ b/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c
@@ -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);