Commit 30ec2b97 authored Nov 03, 2017 by Jerry (Fangzhi) Zuo Committed by Alex Deucher Nov 28, 2017

drm/amd/display: Check aux channel before MST resume



It is to fix: MST display failed to resume from S3

At the beginning of resume from S3, need to check if mgr->aux is
NULL. Fake MST encoder doesn't have real aux channel.

Signed-off-by: Jerry (Fangzhi) Zuo <Jerry.Zuo@amd.com>
Reviewed-by: Roman Li <Roman.Li@amd.com>
Acked-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

parent 116b2632

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -520,7 +520,8 @@ static int detect_mst_link_for_all_connectors(struct drm_device *dev)

		list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
		aconnector = to_amdgpu_dm_connector(connector);
		if (aconnector->dc_link->type == dc_connection_mst_branch) {
		if (aconnector->dc_link->type == dc_connection_mst_branch &&
		aconnector->mst_mgr.aux) {
		DRM_DEBUG_DRIVER("DM_MST: starting TM on aconnector: %p [id: %d]\n",
		aconnector, aconnector->base.base.id);

Admin message