Commit e8263235 authored by Michael Strauss's avatar Michael Strauss Committed by Alex Deucher
Browse files

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: default avatarMichael Strauss <michael.strauss@amd.com>
Acked-by: default avatarBindu Ramamurthy <bindu.r@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent cf7fc755

drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c

+1 −8
Original line number Diff line number Diff line
@@ -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++;

	}

drivers/gpu/drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.c

+1 −8
Original line number Diff line number Diff line
@@ -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++;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE