Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Revert "drm/amd/display: Don't skip link training for empty dongle"

This reverts commit 80adaebd2d411b7d6872a097634848a71eb13d20.

[WHY]
This change was working around a regression that occured in this:
commit 0301ccbaf67d ("drm/amd/display: DP Compliance 400.1.1 failure")

With the fix to run verify_link_cap when the SINK_COUNT of
dongles becomes non-zero this change is no longer needed.

Cc: Louis Li <Ching-shih.Li@amd.com>
Cc: Wenjing Liu <Wenjing.Liu@amd.com>
Cc: Hersen Wu <hersenxs.wu@amd.com>
Cc: Eric Yang <Eric.Yang2@amd.com>
Reviewed-by: Wenjing Liu <Wenjing.Liu@amd.com>
Signed-off-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Harry Wentland and committed by
Alex Deucher
da2f84ba 3eb6d7ac

+2 -8
+2 -8
drivers/gpu/drm/amd/display/dc/core/dc_link.c
··· 851 851 if (memcmp(&link->dpcd_caps, &prev_dpcd_caps, sizeof(struct dpcd_caps))) 852 852 same_dpcd = false; 853 853 } 854 - /* Active dongle plug in without display or downstream unplug*/ 854 + /* Active dongle downstream unplug*/ 855 855 if (link->type == dc_connection_active_dongle && 856 856 link->dpcd_caps.sink_count.bits.SINK_COUNT == 0) { 857 - if (prev_sink != NULL) { 857 + if (prev_sink != NULL) 858 858 /* Downstream unplug */ 859 859 dc_sink_release(prev_sink); 860 - } else { 861 - /* Empty dongle plug in */ 862 - dp_verify_link_cap_with_retries(link, 863 - &link->reported_link_cap, 864 - LINK_TRAINING_MAX_VERIFY_RETRY); 865 - } 866 860 return true; 867 861 } 868 862