drm/amd/display: Update RN/VGH active display count workaround

[WHY]
Virtual signals were previously counted as a workaround to S0i2 hang
which is fixed on Renoir. This blocks S0i3 diags testing.

[HOW]
Stop counting virtual signals as S0i2 hang is fixed on Renoir.

Signed-off-by: Michael Strauss <michael.strauss@amd.com>
Acked-by: Bindu Ramamurthy <bindu.r@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c b/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c
index d00b02553d62ed6a22db5eb3c7535fd9ab0ef267..9aa1b63bb16194b424e8ea5eecdc152089d93e03 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c
+++ b/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c
@@ -75,15 +75,8 @@ int rn_get_active_display_cnt_wa(
        for (i = 0; i < dc->link_count; i++) {
                const struct dc_link *link = dc->links[i];
 
-               /*
-                * Only notify active stream or virtual stream.
-                * Need to notify virtual stream to work around
-                * headless case. HPD does not fire when system is in
-                * S0i2.
-                */
                /* abusing the fact that the dig and phy are coupled to see if the phy is enabled */
-               if (link->connector_signal == SIGNAL_TYPE_VIRTUAL ||
-                               link->link_enc->funcs->is_dig_enabled(link->link_enc))
+               if (link->link_enc->funcs->is_dig_enabled(link->link_enc))
                        display_count++;
        }
 

diff --git a/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.c b/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.c
index 9a8e66bba9c0529f0ccfd304a45bda613998718e..991b9c5beaa301ba9311c2ed6c23a62100c6bcd8 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.c
+++ b/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.c
@@ -74,15 +74,8 @@ int vg_get_active_display_cnt_wa(
        for (i = 0; i < dc->link_count; i++) {
                const struct dc_link *link = dc->links[i];
 
-               /*
-                * Only notify active stream or virtual stream.
-                * Need to notify virtual stream to work around
-                * headless case. HPD does not fire when system is in
-                * S0i2.
-                */
                /* abusing the fact that the dig and phy are coupled to see if the phy is enabled */
-               if (link->connector_signal == SIGNAL_TYPE_VIRTUAL ||
-                               link->link_enc->funcs->is_dig_enabled(link->link_enc))
+               if (link->link_enc->funcs->is_dig_enabled(link->link_enc))
                        display_count++;
        }