]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
drm/amd/display: avoid dig reg access timeout on usb4 link training fail
authorZhongwei <Zhongwei.Zhang@amd.com>
Tue, 13 Jan 2026 07:51:42 +0000 (15:51 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Tue, 27 Jan 2026 23:11:00 +0000 (18:11 -0500)
[Why]
When usb4 link training fails, the dpia sym clock will be disabled and SYMCLK
source should be changed back to phy clock. In enable_streams, it is
assumed that link training succeeded and will switch from refclk to
phy clock. But phy clk here might not be on. Dig reg access timeout
will occur.

[How]
When enable_stream is hit, check if link training failed for usb4.
If it did, fall back to the ref clock to avoid reg access timeout.

Reviewed-by: Wenjing Liu <wenjing.liu@amd.com>
Signed-off-by: Zhongwei <Zhongwei.Zhang@amd.com>
Signed-off-by: Aurabindo Pillai <aurabindo.pillai@amd.com>
Tested-by: Dan Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.c

index 77ac7b22b8dc54809c808611a11bd195ce1e6035..16ea6179640e8f0b9090c6aaafae4b35ef366354 100644 (file)
@@ -3058,9 +3058,17 @@ void dcn20_enable_stream(struct pipe_ctx *pipe_ctx)
                        dccg->funcs->enable_symclk32_se(dccg, dp_hpo_inst, phyd32clk);
                }
        } else {
-               if (dccg->funcs->enable_symclk_se)
-                       dccg->funcs->enable_symclk_se(dccg, stream_enc->stream_enc_inst,
+               if (dccg->funcs->enable_symclk_se && link_enc) {
+                       if (link->ep_type == DISPLAY_ENDPOINT_USB4_DPIA
+                               && link->cur_link_settings.link_rate == LINK_RATE_UNKNOWN
+                               && !link->link_status.link_active) {
+                               if (dccg->funcs->disable_symclk_se)
+                                       dccg->funcs->disable_symclk_se(dccg, stream_enc->stream_enc_inst,
                                                      link_enc->transmitter - TRANSMITTER_UNIPHY_A);
+                       } else
+                               dccg->funcs->enable_symclk_se(dccg, stream_enc->stream_enc_inst,
+                                                     link_enc->transmitter - TRANSMITTER_UNIPHY_A);
+               }
        }
 
        if (dc->res_pool->dccg->funcs->set_pixel_rate_div)