blob: 8aeac1e8073f2ee3c6abde4e474df29634cf94b9 [file] [log] [blame]
From 7cdbad6f0040a7cf4449abc309466201849c55a2 Mon Sep 17 00:00:00 2001
From: Lars-Peter Clausen <>
Date: Tue, 5 Sep 2017 14:10:15 +0200
Subject: [PATCH 0001/1795] drm/bridge: adv7511: Properly update EDID when no
EDID was found
Currently adv7511_get_modes() bails out early when no EDID could be
retrieved. This leaves the previous EDID in place, which is typically not
the intended behavior and might confuse applications. Instead the EDID
should be cleared when no EDID could be retrieved.
All functions that are called after the EDID check handle the case where
the EDID is NULL just fine and exhibit the expected behavior, so just drop
the check.
Signed-off-by: Lars-Peter Clausen <>
Tested-by: John Stultz <>
Signed-off-by: Archit Taneja <>
(cherry picked from commit 6f39ed4f0939e6bef722f0096894c1a986da9c9a)
Signed-off-by: Simon Horman <>
Signed-off-by: Geert Uytterhoeven <>
drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
index f5091827628a..13542940056b 100644
--- a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
+++ b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
@@ -603,8 +603,6 @@ static int adv7511_get_modes(struct adv7511 *adv7511,
adv7511->edid = edid;
- if (!edid)
- return 0;
drm_mode_connector_update_edid_property(connector, edid);
count = drm_add_edid_modes(connector, edid);