diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2476-drm-amd-display-Fix-NULL-pointer-on-MST-chained-mode.patch')
-rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2476-drm-amd-display-Fix-NULL-pointer-on-MST-chained-mode.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2476-drm-amd-display-Fix-NULL-pointer-on-MST-chained-mode.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2476-drm-amd-display-Fix-NULL-pointer-on-MST-chained-mode.patch new file mode 100644 index 00000000..6e7eb4b7 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2476-drm-amd-display-Fix-NULL-pointer-on-MST-chained-mode.patch @@ -0,0 +1,37 @@ +From deee6dbeaccb4923d65fffc0884eaa9eabb68435 Mon Sep 17 00:00:00 2001 +From: Jerry Zuo <Jerry.Zuo@amd.com> +Date: Fri, 8 Sep 2017 16:40:34 -0400 +Subject: [PATCH 2476/4131] drm/amd/display: Fix NULL pointer on MST chained + mode + +Prevent NULL pointer on new_stream being added to ctx +when added MST connectors cannot be found in existing crtc_state +in the chained mode + +Signed-off-by: Jerry Zuo <Jerry.Zuo@amd.com> +Reviewed-by: Harry Wentland <Harry.Wentland@amd.com> +--- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +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 28be10b..5565e32 100644 +--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c ++++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +@@ -4690,6 +4690,13 @@ static int dm_update_crtcs_state(struct dc *dc, + *lock_and_validation_needed = true; + + } else {/* Add stream for any updated/enabled CRTC */ ++ /* ++ * Quick fix to prevent NULL pointer on new_stream when ++ * added MST connectors not found in existing crtc_state in the chained mode ++ * TODO: need to dig out the root cause of that ++ */ ++ if (!aconnector || (!aconnector->dc_sink && aconnector->mst_port)) ++ continue; + + if (modereset_required(crtc_state)) + goto next_crtc; +-- +2.7.4 + |