From: Jerry Zuo <Jerry.Zuo@xxxxxxx>
Needs effort to take care of the fake sink scenario
in downstream daisy chain device. Exclude MST from
fake sink feature for now.
Signed-off-by: Jerry Zuo <Jerry.Zuo at amd.com>
Reviewed-by: Harry Wentland <Harry.Wentland at amd.com>
---
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 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 8e1de7af310c..fcf77f88a0f3 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -2371,8 +2371,16 @@ static struct dc_stream_state *create_stream_for_sink(
drm_connector = &aconnector->base;
- if (!aconnector->dc_sink)
+ if (!aconnector->dc_sink) {
+ /*
+ * Exclude MST from creating fake_sink
+ * TODO: need to enable MST into fake_sink feature
+ */
+ if (aconnector->mst_port)
+ goto stream_create_fail;
+
create_fake_sink(aconnector);
+ }
stream = dc_create_stream_for_sink(aconnector->dc_sink);
@@ -4541,7 +4549,8 @@ static int dm_update_crtcs_state(
aconnector = amdgpu_dm_find_first_crct_matching_connector(state, crtc, true);
/* TODO This hack should go away */
- if (aconnector) {
+ if (aconnector && enable) {
+ // Make sure fake sink is created in plug-in scenario
conn_state = drm_atomic_get_connector_state(state,
&aconnector->base);
--
2.14.1
