[PATCH AUTOSEL 6.12 300/486] drm/amd/display: Add support for disconnected eDP streams

[Sasha Levin]

From: Harry VanZyllDeJong <hvanz...@amd.com>

[ Upstream commit 6571bef25fe48c642f7a69ccf7c3198b317c136a ]

[Why]
eDP may not be connected to the GPU on driver start causing
fail enumeration.

[How]
Move the virtual signal type check before the eDP connector
signal check.

Reviewed-by: Wenjing Liu <wenjing....@amd.com>
Signed-off-by: Harry VanZyllDeJong <hvanz...@amd.com>
Signed-off-by: Roman Li <roman...@amd.com>
Tested-by: Daniel Wheeler <daniel.whee...@amd.com>
Signed-off-by: Alex Deucher <alexander.deuc...@amd.com>
Signed-off-by: Sasha Levin <sas...@kernel.org>
---
 .../drm/amd/display/dc/link/protocols/link_dp_capability.c  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_capability.c 
b/drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_capability.c
index 23e650e39910e..d9a1e1a599674 100644
--- a/drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_capability.c
+++ b/drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_capability.c
@@ -945,6 +945,9 @@ bool link_decide_link_settings(struct dc_stream_state 
*stream,
                 * TODO: add MST specific link training routine
                 */
                decide_mst_link_settings(link, link_setting);
+       } else if (stream->signal == SIGNAL_TYPE_VIRTUAL) {
+               link_setting->lane_count = LANE_COUNT_FOUR;
+               link_setting->link_rate = LINK_RATE_HIGH3;
        } else if (link->connector_signal == SIGNAL_TYPE_EDP) {
                /* enable edp link optimization for DSC eDP case */
                if (stream->timing.flags.DSC) {
@@ -967,9 +970,6 @@ bool link_decide_link_settings(struct dc_stream_state 
*stream,
                } else {
                        edp_decide_link_settings(link, link_setting, req_bw);
                }
-       } else if (stream->signal == SIGNAL_TYPE_VIRTUAL) {
-               link_setting->lane_count = LANE_COUNT_FOUR;
-               link_setting->link_rate = LINK_RATE_HIGH3;
        } else {
                decide_dp_link_settings(link, link_setting, req_bw);
        }
-- 
2.39.5