Commit 11b92df8 authored by Aurabindo Pillai's avatar Aurabindo Pillai Committed by Alex Deucher
Browse files

Revert "Revert drm/amd/display: Enable Freesync Video Mode by default" 



This reverts commit 4243c84a.

Enables freesync video by default, since the hang and corruption issue
on eDP panels are now fixed.

Acked-by: default avatarStylon Wang <stylon.wang@amd.com>
Signed-off-by: default avatarAurabindo Pillai <aurabindo.pillai@amd.com>
Reviewed-by: default avatarRodrigo Siqueira <rjordrigo@amd.com>
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 09d49e14

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

+5 −7
Original line number Diff line number Diff line
@@ -6039,8 +6039,7 @@ create_stream_for_sink(struct amdgpu_dm_connector *aconnector, 
		 */

		DRM_DEBUG_DRIVER("No preferred mode found\n");

	} else {

		recalculate_timing = amdgpu_freesync_vid_mode &&

				 is_freesync_video_mode(&mode, aconnector);

		recalculate_timing = is_freesync_video_mode(&mode, aconnector);

		if (recalculate_timing) {

			freesync_mode = get_highest_refresh_rate_mode(aconnector, false);

			drm_mode_copy(&saved_mode, &mode);
@@ -7233,7 +7232,7 @@ static void amdgpu_dm_connector_add_freesync_modes(struct drm_connector *connect 
	struct amdgpu_dm_connector *amdgpu_dm_connector =

		to_amdgpu_dm_connector(connector);



	if (!(amdgpu_freesync_vid_mode && edid))

	if (!edid)

		return;



	if (amdgpu_dm_connector->max_vfreq - amdgpu_dm_connector->min_vfreq > 10)
@@ -9293,8 +9292,7 @@ static int dm_update_crtc_state(struct amdgpu_display_manager *dm, 
		 * TODO: Refactor this function to allow this check to work

		 * in all conditions.

		 */

		if (amdgpu_freesync_vid_mode &&

		    dm_new_crtc_state->stream &&

		if (dm_new_crtc_state->stream &&

		    is_timing_unchanged_for_freesync(new_crtc_state, old_crtc_state))

			goto skip_modeset;
@@ -9336,7 +9334,7 @@ static int dm_update_crtc_state(struct amdgpu_display_manager *dm, 
		}



		/* Now check if we should set freesync video mode */

		if (amdgpu_freesync_vid_mode && dm_new_crtc_state->stream &&

		if (dm_new_crtc_state->stream &&

		    dc_is_stream_unchanged(new_stream, dm_old_crtc_state->stream) &&

		    dc_is_stream_scaling_unchanged(new_stream, dm_old_crtc_state->stream) &&

		    is_timing_unchanged_for_freesync(new_crtc_state,
@@ -9350,7 +9348,7 @@ static int dm_update_crtc_state(struct amdgpu_display_manager *dm, 
			set_freesync_fixed_config(dm_new_crtc_state);



			goto skip_modeset;

		} else if (amdgpu_freesync_vid_mode && aconnector &&

		} else if (aconnector &&

			   is_freesync_video_mode(&new_crtc_state->mode,

						  aconnector)) {

			struct drm_display_mode *high_mode;