On Fri, May 30, 2025 at 4:09 PM Aurabindo Pillai aurabindo.pillai@amd.com wrote:

This reverts commit 219898d29c438d8ec34a5560fac4ea8f6b8d4f20 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

Already included in my -fixes PR for this week: https://lists.freedesktop.org/archives/amd-gfx/2025-May/125350.html

Alex

---

.../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index 90889f6867aad..9f2e26336cccf 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -676,21 +676,15 @@ static void dm_crtc_high_irq(void *interrupt_params) spin_lock_irqsave(&adev_to_drm(adev)->event_lock, flags);

    if (acrtc->dm_irq_params.stream &&

•           acrtc->dm_irq_params.vrr_params.supported) {
  

•           bool replay_en = acrtc->dm_irq_params.stream->link->replay_settings.replay_feature_enabled;
  

•           bool psr_en = acrtc->dm_irq_params.stream->link->psr_settings.psr_feature_enabled;
  

•           bool fs_active_var_en = acrtc->dm_irq_params.freesync_config.state == VRR_STATE_ACTIVE_VARIABLE;
  

•       acrtc->dm_irq_params.vrr_params.supported &&
  

•       acrtc->dm_irq_params.freesync_config.state ==
  

•               VRR_STATE_ACTIVE_VARIABLE) {
            mod_freesync_handle_v_update(adev->dm.freesync_module,
                                         acrtc->dm_irq_params.stream,
                                         &acrtc->dm_irq_params.vrr_params);
  
  

•           /* update vmin_vmax only if freesync is enabled, or only if PSR and REPLAY are disabled */
  

•           if (fs_active_var_en || (!fs_active_var_en && !replay_en && !psr_en)) {
  

•                   dc_stream_adjust_vmin_vmax(adev->dm.dc,
  

•                                   acrtc->dm_irq_params.stream,
  

•                                   &acrtc->dm_irq_params.vrr_params.adjust);
  

•           }
  

•           dc_stream_adjust_vmin_vmax(adev->dm.dc, acrtc->dm_irq_params.stream,
  

•                                      &acrtc->dm_irq_params.vrr_params.adjust);
    }
  
    /*
  

-- 2.49.0