aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2017-09-05 08:10:15 -0400
committerArchit Taneja <architt@codeaurora.org>2017-09-16 05:38:47 -0400
commit6f39ed4f0939e6bef722f0096894c1a986da9c9a (patch)
tree37ee7822f50fc7d8057313bc6453a0127815e027
parent3fa6a073542fec11f388d687a4db5c64e1e347a4 (diff)
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 <lars@metafoo.de> Tested-by: John Stultz <john.stultz@linaro.org> Signed-off-by: Archit Taneja <architt@codeaurora.org> Link: https://patchwork.freedesktop.org/patch/msgid/20170905121018.11477-1-lars@metafoo.de
-rw-r--r--drivers/gpu/drm/bridge/adv7511/adv7511_drv.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
index b2431aee7887..fb8f4cd29e15 100644
--- a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
+++ b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
@@ -591,8 +591,6 @@ static int adv7511_get_modes(struct adv7511 *adv7511,
591 591
592 kfree(adv7511->edid); 592 kfree(adv7511->edid);
593 adv7511->edid = edid; 593 adv7511->edid = edid;
594 if (!edid)
595 return 0;
596 594
597 drm_mode_connector_update_edid_property(connector, edid); 595 drm_mode_connector_update_edid_property(connector, edid);
598 count = drm_add_edid_modes(connector, edid); 596 count = drm_add_edid_modes(connector, edid);