From dbe4ebc8fdba868bf8de5dc6a7c81cddf5126249 Mon Sep 17 00:00:00 2001 From: Tatenda Chipeperekwa Date: Wed, 5 Feb 2020 18:15:28 -0800 Subject: [PATCH] disp: msm: dp: skip edid reading for mst branch When DP is working in MST mode, reading native EDID from MST branch is not a valid operation. Change-Id: I297d2b25b2c3166d68ef3eba941ca787d8bce8d3 Signed-off-by: Xiaowen Wu Signed-off-by: Tatenda Chipeperekwa --- msm/dp/dp_panel.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/msm/dp/dp_panel.c b/msm/dp/dp_panel.c index b6ae4727a8..65c5fc748e 100644 --- a/msm/dp/dp_panel.c +++ b/msm/dp/dp_panel.c @@ -1790,12 +1790,17 @@ static int dp_panel_read_sink_caps(struct dp_panel *dp_panel, } } + /* There is no need to read EDID from MST branch */ + if (panel->parser->has_mst && dp_panel->read_mst_cap(dp_panel)) + goto skip_edid; + rc = dp_panel_read_edid(dp_panel, connector); if (rc) { DP_ERR("panel edid read failed, set failsafe mode\n"); return rc; } +skip_edid: dp_panel->widebus_en = panel->parser->has_widebus; dp_panel->dsc_feature_enable = panel->parser->dsc_feature_enable; dp_panel->fec_feature_enable = panel->parser->fec_feature_enable;