drm: bridge: simple-bridge: clear the EDID property on failures

jnikula · jnikula · commit 400bb4ee97b4 · 2024-02-08T17:12:21.000+02:00
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/3e3c9505fa6859a96ead70121791fd9c4d946b6f.1706038510.git.jani.nikula@intel.com
diff --git 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);
 

Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,8 @@ static int simple_bridge_get_modes(struct drm_connector *connector)`
`62`	`62`	`drm_edid = NULL;`
`63`	`63`	`}`
`64`	`64`
	`65`	`+ drm_edid_connector_update(connector, drm_edid);`
	`66`	`+`
`65`	`67`	`if (!drm_edid) {`
`66`	`68`	`/*`
`67`	`69`	`* 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)`
`73`	`75`	`return ret;`
`74`	`76`	`}`
`75`	`77`
`76`		`- drm_edid_connector_update(connector, drm_edid);`
`77`	`78`	`ret = drm_edid_connector_add_modes(connector);`
`78`	`79`	`drm_edid_free(drm_edid);`
`79`	`80`