Skip to content

Commit 1b824ee

Browse files
Aurabindo Pillaialexdeucher
authored andcommitted
Revert "drm/amd/display: more liberal vmin/vmax update for freesync"
This reverts commit cfb2d41 since it causes regressions on certain configs. Revert until the issue can be isolated and debugged. Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/4238 Signed-off-by: Aurabindo Pillai <aurabindo.pillai@amd.com> Acked-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Cc: stable@vger.kernel.org
1 parent d78eb80 commit 1b824ee

1 file changed

Lines changed: 5 additions & 11 deletions

File tree

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

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -676,21 +676,15 @@ static void dm_crtc_high_irq(void *interrupt_params)
676676
spin_lock_irqsave(&adev_to_drm(adev)->event_lock, flags);
677677

678678
if (acrtc->dm_irq_params.stream &&
679-
acrtc->dm_irq_params.vrr_params.supported) {
680-
bool replay_en = acrtc->dm_irq_params.stream->link->replay_settings.replay_feature_enabled;
681-
bool psr_en = acrtc->dm_irq_params.stream->link->psr_settings.psr_feature_enabled;
682-
bool fs_active_var_en = acrtc->dm_irq_params.freesync_config.state == VRR_STATE_ACTIVE_VARIABLE;
683-
679+
acrtc->dm_irq_params.vrr_params.supported &&
680+
acrtc->dm_irq_params.freesync_config.state ==
681+
VRR_STATE_ACTIVE_VARIABLE) {
684682
mod_freesync_handle_v_update(adev->dm.freesync_module,
685683
acrtc->dm_irq_params.stream,
686684
&acrtc->dm_irq_params.vrr_params);
687685

688-
/* update vmin_vmax only if freesync is enabled, or only if PSR and REPLAY are disabled */
689-
if (fs_active_var_en || (!fs_active_var_en && !replay_en && !psr_en)) {
690-
dc_stream_adjust_vmin_vmax(adev->dm.dc,
691-
acrtc->dm_irq_params.stream,
692-
&acrtc->dm_irq_params.vrr_params.adjust);
693-
}
686+
dc_stream_adjust_vmin_vmax(adev->dm.dc, acrtc->dm_irq_params.stream,
687+
&acrtc->dm_irq_params.vrr_params.adjust);
694688
}
695689

696690
/*

0 commit comments

Comments
 (0)