From 241a074fc1342b8f6a88af4b7bdc014692ebcde7 Mon Sep 17 00:00:00 2001 From: "Shen, George" Date: Fri, 28 Jan 2022 22:03:55 +0800 Subject: [PATCH] drm/amd/display: Add link enc null ptr check for cable ID (#2597) [Why] Certain configurations will result in link encoder to not be assigned to the link at the time we apply cable ID logic. We should skip it in those cases. [How] Check if link_enc is not null before applying cable ID. Tested-by: Daniel Wheeler Reviewed-by: Wenjing Liu Acked-by: Stylon Wang Signed-off-by: George Shen Signed-off-by: Alex Deucher --- drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c b/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c index 8cfc9a8..117183b5 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c @@ -6327,7 +6327,12 @@ void dpcd_set_source_specific_data(struct dc_link *link) void dpcd_update_cable_id(struct dc_link *link) { - if (!link->link_enc->features.flags.bits.IS_UHBR10_CAPABLE || + struct link_encoder *link_enc = NULL; + + link_enc = link_enc_cfg_get_link_enc(link); + + if (!link_enc || + !link_enc->features.flags.bits.IS_UHBR10_CAPABLE || link->dprx_status.cable_id_updated) return; -- 2.7.4