aboutsummaryrefslogtreecommitdiffstats
path: root/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3096-drm-amd-display-Fix-topology-change-issue-in-MST-reh.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3096-drm-amd-display-Fix-topology-change-issue-in-MST-reh.patch')
-rw-r--r--meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3096-drm-amd-display-Fix-topology-change-issue-in-MST-reh.patch39
1 files changed, 39 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3096-drm-amd-display-Fix-topology-change-issue-in-MST-reh.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3096-drm-amd-display-Fix-topology-change-issue-in-MST-reh.patch
new file mode 100644
index 00000000..d3fb0533
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3096-drm-amd-display-Fix-topology-change-issue-in-MST-reh.patch
@@ -0,0 +1,39 @@
+From 7df380bd36399caf8a2efde0ddfe82495b83f5d1 Mon Sep 17 00:00:00 2001
+From: "Jerry (Fangzhi) Zuo" <Jerry.Zuo@amd.com>
+Date: Tue, 12 Dec 2017 17:33:57 -0500
+Subject: [PATCH 3096/4131] drm/amd/display: Fix topology change issue in MST
+ rehook
+
+When topology changed and rehook up MST display to the same DP
+connector, need to take care of drm_dp_mst_port object.
+
+Due to the topology is changed, drm_dp_mst_port and corresponding
+i2c_algorithm object could be NULL in such situation.
+
+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>
+---
+ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
+index 41ca3b1..f7d0a40 100644
+--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
++++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
+@@ -196,6 +196,12 @@ void dm_dp_mst_dc_sink_create(struct drm_connector *connector)
+ .link = aconnector->dc_link,
+ .sink_signal = SIGNAL_TYPE_DISPLAY_PORT_MST };
+
++ /*
++ * TODO: Need to further figure out why ddc.algo is NULL while MST port exists
++ */
++ if (!aconnector->port || !aconnector->port->aux.ddc.algo)
++ return;
++
+ edid = drm_dp_mst_get_edid(connector, &aconnector->mst_port->mst_mgr, aconnector->port);
+
+ if (!edid) {
+--
+2.7.4
+