drm/amd/display: Assign link type before check dsc workaround.

[Why]
link type is not assigned before check dpia_mst_dsc_always_on conditions.

Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Reviewed-by: Wenjing Liu <Wenjing.Liu@amd.com>
Acked-by: Pavle Kotarac <Pavle.Kotarac@amd.com>
Signed-off-by: JinZe.Xu <JinZe.Xu@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 7f8da6a0f74a5a95c2fc8bc19b7811457ed103eb..4bb78e356ebd240ce67faeb878614e2497752139 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/core/dc_link.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_link.c
@@ -832,8 +832,9 @@ static bool discover_dp_mst_topology(struct dc_link *link, enum dc_detect_reason
        LINK_INFO("link=%d, mst branch is now Connected\n",
                  link->link_index);
 
-       apply_dpia_mst_dsc_always_on_wa(link);
        link->type = dc_connection_mst_branch;
+       apply_dpia_mst_dsc_always_on_wa(link);
+
        dm_helpers_dp_update_branch_info(link->ctx, link);
        if (dm_helpers_dp_mst_start_top_mgr(link->ctx,
                        link, (reason == DETECT_REASON_BOOT || reason == DETECT_REASON_RESUMEFROMS3S4))) {