Skip to content

Commit 11b92df

Browse files
Aurabindo Pillaialexdeucher
authored andcommitted
Revert "Revert drm/amd/display: Enable Freesync Video Mode by default"
This reverts commit 4243c84. Enables freesync video by default, since the hang and corruption issue on eDP panels are now fixed. Acked-by: Stylon Wang <stylon.wang@amd.com> Signed-off-by: Aurabindo Pillai <aurabindo.pillai@amd.com> Reviewed-by: Rodrigo Siqueira <rjordrigo@amd.com> Tested-by: Daniel Wheeler <daniel.wheeler@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
1 parent 09d49e1 commit 11b92df

1 file changed

Lines changed: 5 additions & 7 deletions

File tree

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

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6039,8 +6039,7 @@ create_stream_for_sink(struct amdgpu_dm_connector *aconnector,
60396039
*/
60406040
DRM_DEBUG_DRIVER("No preferred mode found\n");
60416041
} else {
6042-
recalculate_timing = amdgpu_freesync_vid_mode &&
6043-
is_freesync_video_mode(&mode, aconnector);
6042+
recalculate_timing = is_freesync_video_mode(&mode, aconnector);
60446043
if (recalculate_timing) {
60456044
freesync_mode = get_highest_refresh_rate_mode(aconnector, false);
60466045
drm_mode_copy(&saved_mode, &mode);
@@ -7233,7 +7232,7 @@ static void amdgpu_dm_connector_add_freesync_modes(struct drm_connector *connect
72337232
struct amdgpu_dm_connector *amdgpu_dm_connector =
72347233
to_amdgpu_dm_connector(connector);
72357234

7236-
if (!(amdgpu_freesync_vid_mode && edid))
7235+
if (!edid)
72377236
return;
72387237

72397238
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,
92939292
* TODO: Refactor this function to allow this check to work
92949293
* in all conditions.
92959294
*/
9296-
if (amdgpu_freesync_vid_mode &&
9297-
dm_new_crtc_state->stream &&
9295+
if (dm_new_crtc_state->stream &&
92989296
is_timing_unchanged_for_freesync(new_crtc_state, old_crtc_state))
92999297
goto skip_modeset;
93009298

@@ -9336,7 +9334,7 @@ static int dm_update_crtc_state(struct amdgpu_display_manager *dm,
93369334
}
93379335

93389336
/* Now check if we should set freesync video mode */
9339-
if (amdgpu_freesync_vid_mode && dm_new_crtc_state->stream &&
9337+
if (dm_new_crtc_state->stream &&
93409338
dc_is_stream_unchanged(new_stream, dm_old_crtc_state->stream) &&
93419339
dc_is_stream_scaling_unchanged(new_stream, dm_old_crtc_state->stream) &&
93429340
is_timing_unchanged_for_freesync(new_crtc_state,
@@ -9350,7 +9348,7 @@ static int dm_update_crtc_state(struct amdgpu_display_manager *dm,
93509348
set_freesync_fixed_config(dm_new_crtc_state);
93519349

93529350
goto skip_modeset;
9353-
} else if (amdgpu_freesync_vid_mode && aconnector &&
9351+
} else if (aconnector &&
93549352
is_freesync_video_mode(&new_crtc_state->mode,
93559353
aconnector)) {
93569354
struct drm_display_mode *high_mode;

0 commit comments

Comments
 (0)