Skip to content

Commit 80fe1eb

Browse files
Aurabindo Pillaigregkh
authored andcommitted
Revert "drm/amd/display: more liberal vmin/vmax update for freesync"
commit 1b824ee upstream. 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 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent d452b16 commit 80fe1eb

File tree

1 file changed

+5
-11
lines changed

1 file changed

+5
-11
lines changed

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

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

670670
if (acrtc->dm_irq_params.stream &&
671-
acrtc->dm_irq_params.vrr_params.supported) {
672-
bool replay_en = acrtc->dm_irq_params.stream->link->replay_settings.replay_feature_enabled;
673-
bool psr_en = acrtc->dm_irq_params.stream->link->psr_settings.psr_feature_enabled;
674-
bool fs_active_var_en = acrtc->dm_irq_params.freesync_config.state == VRR_STATE_ACTIVE_VARIABLE;
675-
671+
acrtc->dm_irq_params.vrr_params.supported &&
672+
acrtc->dm_irq_params.freesync_config.state ==
673+
VRR_STATE_ACTIVE_VARIABLE) {
676674
mod_freesync_handle_v_update(adev->dm.freesync_module,
677675
acrtc->dm_irq_params.stream,
678676
&acrtc->dm_irq_params.vrr_params);
679677

680-
/* update vmin_vmax only if freesync is enabled, or only if PSR and REPLAY are disabled */
681-
if (fs_active_var_en || (!fs_active_var_en && !replay_en && !psr_en)) {
682-
dc_stream_adjust_vmin_vmax(adev->dm.dc,
683-
acrtc->dm_irq_params.stream,
684-
&acrtc->dm_irq_params.vrr_params.adjust);
685-
}
678+
dc_stream_adjust_vmin_vmax(adev->dm.dc, acrtc->dm_irq_params.stream,
679+
&acrtc->dm_irq_params.vrr_params.adjust);
686680
}
687681

688682
/*

0 commit comments

Comments
 (0)