diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2815-drm-amd-display-Check-aux-channel-before-MST-resume.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2815-drm-amd-display-Check-aux-channel-before-MST-resume.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2815-drm-amd-display-Check-aux-channel-before-MST-resume.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2815-drm-amd-display-Check-aux-channel-before-MST-resume.patch new file mode 100644 index 00000000..1f1c701b --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2815-drm-amd-display-Check-aux-channel-before-MST-resume.patch @@ -0,0 +1,36 @@ +From 2a1871828f4adb73ef6c62ce186f3016dceb4718 Mon Sep 17 00:00:00 2001 +From: "Jerry (Fangzhi) Zuo" <Jerry.Zuo@amd.com> +Date: Fri, 3 Nov 2017 16:04:34 -0400 +Subject: [PATCH 2815/4131] 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> +--- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +index 66812ba..b25f5c9 100644 +--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c ++++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +@@ -532,7 +532,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); + +-- +2.7.4 + |