OSDN Git Service

drm/amd/display: Write DSC enable to MST DPCD
authorDavid Francis <David.Francis@amd.com>
Wed, 19 Jun 2019 18:48:16 +0000 (14:48 -0400)
committerAlex Deucher <alexander.deucher@amd.com>
Thu, 9 Jan 2020 23:07:47 +0000 (18:07 -0500)
Rework the dm_helpers_write_dsc_enable callback to
handle the MST case.

Use the cached dsc_aux field.

Reviewed-by: Wenjing Liu <Wenjing.Liu@amd.com>
Signed-off-by: David Francis <David.Francis@amd.com>
Signed-off-by: Mikita Lipski <mikita.lipski@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c

index 66f266a..069b7a6 100644 (file)
@@ -37,6 +37,7 @@
 #include "dc.h"
 #include "amdgpu_dm.h"
 #include "amdgpu_dm_irq.h"
+#include "amdgpu_dm_mst_types.h"
 
 #include "dm_helpers.h"
 
@@ -516,8 +517,24 @@ bool dm_helpers_dp_write_dsc_enable(
 )
 {
        uint8_t enable_dsc = enable ? 1 : 0;
+       struct amdgpu_dm_connector *aconnector;
+
+       if (!stream)
+               return false;
+
+       if (stream->signal == SIGNAL_TYPE_DISPLAY_PORT_MST) {
+               aconnector = (struct amdgpu_dm_connector *)stream->dm_stream_context;
+
+               if (!aconnector->dsc_aux)
+                       return false;
+
+               return (drm_dp_dpcd_write(aconnector->dsc_aux, DP_DSC_ENABLE, &enable_dsc, 1) >= 0);
+       }
+
+       if (stream->signal == SIGNAL_TYPE_DISPLAY_PORT)
+               return dm_helpers_dp_write_dpcd(ctx, stream->link, DP_DSC_ENABLE, &enable_dsc, 1);
 
-       return dm_helpers_dp_write_dpcd(ctx, stream->sink->link, DP_DSC_ENABLE, &enable_dsc, 1);
+       return false;
 }
 
 bool dm_helpers_is_dp_sink_present(struct dc_link *link)