drm/amd/display: Fix HDCP QUERY Error for eDP and Tiled

[WHY]
For dio_output_encoder ID we are relying on SW concept which is
invisible to HW

[HOW]
Needed to create separate cases for when DPIA and non DPIA for
dio link encoder ID

Reviewed-by: Wenjing Liu <Wenjing.Liu@amd.com>
Reviewed-by: James Zhang <james.zhang@amd.com>
Acked-by: Tom Chung <chiahsuan.chung@amd.com>
Signed-off-by: Mustapha Ghaddar <mghaddar@amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

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 faab1460d0b5564cb738607d15972b84f58dd9c2..3d13ee32a3dbfb597ae0e2169a511bee20cc544d 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/core/dc_link.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_link.c
@@ -3966,8 +3966,12 @@ static void update_psp_stream_config(struct pipe_ctx *pipe_ctx, bool dpms_off)
        if (is_dp_128b_132b_signal(pipe_ctx))
                config.link_enc_idx = pipe_ctx->link_res.hpo_dp_link_enc->inst;
 
-       /* dio output index */
-       config.dio_output_idx = link_enc->transmitter - TRANSMITTER_UNIPHY_A;
+       /* dio output index is dpia index for DPIA endpoint & dcio index by default */
+       if (pipe_ctx->stream->link->ep_type == DISPLAY_ENDPOINT_USB4_DPIA)
+               config.dio_output_idx = pipe_ctx->stream->link->link_id.enum_id - ENUM_ID_1;
+       else
+               config.dio_output_idx = link_enc->transmitter - TRANSMITTER_UNIPHY_A;
+
 
        /* phy index */
        config.phy_idx = resource_transmitter_to_phy_idx(