[PATCH 19/35] drm/amd/display: Apply fake sink back to MST sequence

[Bhawanpreet Lakha]

From: "Jerry (Fangzhi) Zuo" <jerry....@amd.com>

[Why]
It fixes the failure to create stream for sink in the scenario
when hotplug SST and MST in sequence, and disconnect MST.

[How]
Add the fake sink back after the majority of MST rework is done.

Change-Id: I0e4be01f78e337ab6f9f1813b091c081ebdd54b3
Signed-off-by: Jerry (Fangzhi) Zuo <jerry....@amd.com>
Reviewed-by: Nicholas Kazlauskas <nicholas.kazlaus...@amd.com>
Acked-by: Bhawanpreet Lakha <bhawanpreet.la...@amd.com>
Acked-by: Tony Cheng <tony.ch...@amd.com>
---
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c         | 8 +++-----
 .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c   | 3 +++
 2 files changed, 6 insertions(+), 5 deletions(-)

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 5b8a84088f46..125994b4753e 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -3042,11 +3042,9 @@ create_stream_for_sink(struct amdgpu_dm_connector 
*aconnector,
        drm_connector = &aconnector->base;
 
        if (!aconnector->dc_sink) {
-               if (!aconnector->mst_port) {
-                       sink = create_fake_sink(aconnector);
-                       if (!sink)
-                               return stream;
-               }
+               sink = create_fake_sink(aconnector);
+               if (!sink)
+                       return stream;
        } else {
                sink = aconnector->dc_sink;
        }
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 60da1222afaa..73f8e8fa6edb 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
@@ -173,6 +173,9 @@ static int dm_dp_mst_get_modes(struct drm_connector 
*connector)
                aconnector->edid = edid;
        }
 
+       if (aconnector->dc_sink && aconnector->dc_sink->sink_signal == 
SIGNAL_TYPE_VIRTUAL)
+               dc_sink_release(aconnector->dc_sink);
+
        if (!aconnector->dc_sink) {
                struct dc_sink *dc_sink;
                struct dc_sink_init_data init_params = {
-- 
2.17.1

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx