From: Agustin Gutierrez Date: Fri, 15 Oct 2021 17:42:15 +0000 (-0400) Subject: Revert "drm/amd/display: Fix error in dmesg at boot" X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=e848c714dbda4d6f0ad17a4d374af0ce9fcd1615;p=linux.git Revert "drm/amd/display: Fix error in dmesg at boot" This reverts commit 4874ecf5fd1de008756a76796bf255d3b19715c1. Signed-off-by: Agustin Gutierrez Signed-off-by: Alex Deucher --- 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 6db611f9f554c..c01309a1cbf29 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc_link.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc_link.c @@ -1999,7 +1999,7 @@ void blank_all_dp_displays(struct dc *dc, bool hw_init) if ((signal == SIGNAL_TYPE_EDP) || (signal == SIGNAL_TYPE_DISPLAY_PORT)) { - if (hw_init && signal != SIGNAL_TYPE_EDP && dc->links[i]->priv != NULL) { + if (hw_init && signal != SIGNAL_TYPE_EDP) { /* DP 2.0 spec requires that we read LTTPR caps first */ dp_retrieve_lttpr_cap(dc->links[i]); /* if any of the displays are lit up turn them off */ @@ -2025,7 +2025,7 @@ void blank_all_dp_displays(struct dc *dc, bool hw_init) } if (!dc->links[i]->wa_flags.dp_keep_receiver_powered || - (hw_init && signal != SIGNAL_TYPE_EDP && dc->links[i]->priv != NULL)) + (hw_init && signal != SIGNAL_TYPE_EDP)) dp_receiver_power_ctrl(dc->links[i], false); } }