Commit 7e5098ab authored by Aurabindo Pillai's avatar Aurabindo Pillai Committed by Alex Deucher
Browse files

drm/amd/display: Revert "ignore msa parameter only if freesync is enabled" 



This reverts commit 6ffa6799.

This commit introduced a regression in Unigine Heaven benchmark where
the display would turn off due to incorrect handling of the parameter to
ignore MSA packets.

Reviewed-by: default avatarAlvin Lee <Alvin.Lee2@amd.com>
Acked-by: default avatarAlan Liu <HaoPing.Liu@amd.com>
Signed-off-by: default avatarAurabindo Pillai <aurabindo.pillai@amd.com>
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 174a05af

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

+2 −9
Original line number Diff line number Diff line
@@ -8866,22 +8866,15 @@ static void get_freesync_config_for_crtc( 
	struct drm_display_mode *mode = &new_crtc_state->base.mode;

	int vrefresh = drm_mode_vrefresh(mode);

	bool fs_vid_mode = false;

	bool drr_active = false;



	new_crtc_state->vrr_supported = new_con_state->freesync_capable &&

					vrefresh >= aconnector->min_vfreq &&

					vrefresh <= aconnector->max_vfreq;



	drr_active = new_crtc_state->vrr_supported &&

		new_crtc_state->freesync_config.state != VRR_STATE_DISABLED &&

		new_crtc_state->freesync_config.state != VRR_STATE_INACTIVE &&

		new_crtc_state->freesync_config.state != VRR_STATE_UNSUPPORTED;



	if (drr_active)

		new_crtc_state->stream->ignore_msa_timing_param = true;



	if (new_crtc_state->vrr_supported) {

		new_crtc_state->stream->ignore_msa_timing_param = true;

		fs_vid_mode = new_crtc_state->freesync_config.state == VRR_STATE_ACTIVE_FIXED;



		config.min_refresh_in_uhz = aconnector->min_vfreq * 1000000;

		config.max_refresh_in_uhz = aconnector->max_vfreq * 1000000;

		config.vsif_supported = true;