diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2024-01-23 22:37:15 +0300 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2024-02-08 18:12:21 +0300 |
| commit | 400bb4ee97b4e0ce262237ab49d71bf72342ae99 (patch) | |
| tree | 9fff95fd89bb23fe55a3a7b72d42f7eea6447923 /drivers/gpu/drm/bridge | |
| parent | 0d966d59d1e58df8555a3e6760a6eb3956b3d0ef (diff) | |
| download | linux-400bb4ee97b4e0ce262237ab49d71bf72342ae99.tar.xz | |
drm: bridge: simple-bridge: clear the EDID property on failures
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
Diffstat (limited to 'drivers/gpu/drm/bridge')
| -rw-r--r-- | drivers/gpu/drm/bridge/simple-bridge.c | 3 |
1 files changed, 2 insertions, 1 deletions
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); |