diff options
| author | Ahmad Othman <Ahmad.Othman@amd.com> | 2021-11-01 12:07:00 -0400 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2021-11-22 14:45:01 -0500 |
| commit | c09bb36dd1230838d49a5ebf409df804a5ebfdaa (patch) | |
| tree | 784a6e8fdc02f38f379595557e43d63eeb0f303d /drivers/gpu/drm/amd/display | |
| parent | d25e35bc26c3ca8cd728101545cfb3e86a5d7431 (diff) | |
| download | linux-stable-c09bb36dd1230838d49a5ebf409df804a5ebfdaa.tar.gz linux-stable-c09bb36dd1230838d49a5ebf409df804a5ebfdaa.tar.bz2 linux-stable-c09bb36dd1230838d49a5ebf409df804a5ebfdaa.zip | |
drm/amd/display: Secondary display goes blank on Non DCN31
[Why]
Due to integration issues with branch merging,
a regression happened that prevented secondary
displays from lighting up or enabling certain features
[How]
Separated the new logic to be for DCN31 only and retained
pre DCN31 logic for all other ASICs
Reviewed-by: Wenjing Liu <Wenjing.Liu@amd.com>
Acked-by: Wayne Lin <wayne.lin@amd.com>
Signed-off-by: Ahmad Othman <Ahmad.Othman@amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/display')
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/core/dc_link.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link.c b/drivers/gpu/drm/amd/display/dc/core/dc_link.c index 2e2dcd5518da..8a8a5aead34d 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc_link.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc_link.c @@ -3997,7 +3997,8 @@ static void update_psp_stream_config(struct pipe_ctx *pipe_ctx, bool dpms_off) config.phy_idx = link_enc->transmitter - TRANSMITTER_UNIPHY_A; // Add flag to guard new A0 DIG mapping - if (pipe_ctx->stream->ctx->dc->enable_c20_dtm_b0 == true) { + if (pipe_ctx->stream->ctx->dc->enable_c20_dtm_b0 == true && + pipe_ctx->stream->link->dc->ctx->dce_version == DCN_VERSION_3_1) { config.dig_be = link_enc->preferred_engine; config.dio_output_type = pipe_ctx->stream->link->ep_type; config.dio_output_idx = link_enc->transmitter - TRANSMITTER_UNIPHY_A; |