Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f2061af0 authored by Xiaowen Wu's avatar Xiaowen Wu Committed by Gerrit - the friendly Code Review server
Browse files

drm/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: default avatarXiaowen Wu <wxiaowen@codeaurora.org>
parent 271cca3b

drivers/gpu/drm/msm/dp/dp_panel.c

+6 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2012-2019, The Linux Foundation. All rights reserved.

 * Copyright (c) 2012-2020, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -1911,12 +1911,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) {

		pr_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;