Skip to content

Commit cc3554d

Browse files
Aurabindo Pillaiopsiff
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> (cherry picked from commit 3f369af6750583728c8766874ba8a383a16434d1)
1 parent dc647ee commit cc3554d

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
@@ -610,21 +610,15 @@ static void dm_crtc_high_irq(void *interrupt_params)
610610
spin_lock_irqsave(&adev_to_drm(adev)->event_lock, flags);
611611

612612
if (acrtc->dm_irq_params.stream &&
613-
acrtc->dm_irq_params.vrr_params.supported) {
614-
bool replay_en = acrtc->dm_irq_params.stream->link->replay_settings.replay_feature_enabled;
615-
bool psr_en = acrtc->dm_irq_params.stream->link->psr_settings.psr_feature_enabled;
616-
bool fs_active_var_en = acrtc->dm_irq_params.freesync_config.state == VRR_STATE_ACTIVE_VARIABLE;
617-
613+
acrtc->dm_irq_params.vrr_params.supported &&
614+
acrtc->dm_irq_params.freesync_config.state ==
615+
VRR_STATE_ACTIVE_VARIABLE) {
618616
mod_freesync_handle_v_update(adev->dm.freesync_module,
619617
acrtc->dm_irq_params.stream,
620618
&acrtc->dm_irq_params.vrr_params);
621619

622-
/* update vmin_vmax only if freesync is enabled, or only if PSR and REPLAY are disabled */
623-
if (fs_active_var_en || (!fs_active_var_en && !replay_en && !psr_en)) {
624-
dc_stream_adjust_vmin_vmax(adev->dm.dc,
625-
acrtc->dm_irq_params.stream,
626-
&acrtc->dm_irq_params.vrr_params.adjust);
627-
}
620+
dc_stream_adjust_vmin_vmax(adev->dm.dc, acrtc->dm_irq_params.stream,
621+
&acrtc->dm_irq_params.vrr_params.adjust);
628622
}
629623

630624
/*

0 commit comments

Comments
 (0)