Revert "drm/amd/display: Restore 5s vbl offdelay for NV3x+ DGPUs"

Now that proper fixes have been found, let's revert this workaround.

This reverts commit a1fc7bf6677eb547167cb72b3bcafdc34b976692.

Tested-by: Mario Limonciello (AMD) <superm1@kernel.org>
Reviewed-by: Mario Limonciello (AMD) <superm1@kernel.org>
Signed-off-by: Leo Li <sunpeng.li@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
(cherry picked from commit f64a9be5653689ff43e148cd8a6483077488c8e5)
Cc: stable@vger.kernel.org # 8382cd234981: drm/amd/display: consolidate DCN vblank/flip handling onto vupdate_no_lock
Cc: stable@vger.kernel.org # 48ab86360af1: drm/amd/display: check GRPH_FLIP status before sending event
Cc: stable@vger.kernel.org

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 10105341e6db9880d102c5f71fad4bacbdb79c94..9c564cd5edeea5660ebedcc2c3fe910f996afa1d 100644 (file)
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -9675,21 +9675,9 @@ static void manage_dm_interrupts(struct amdgpu_device *adev,
        if (acrtc_state) {
                timing = &acrtc_state->stream->timing;
 
-               if (amdgpu_ip_version(adev, DCE_HWIP, 0) >=
-                     IP_VERSION(3, 2, 0) &&
-                     !(adev->flags & AMD_IS_APU)) {
-                       /*
-                        * DGPUs NV3x and newer that support idle optimizations
-                        * experience intermittent flip-done timeouts on cursor
-                        * updates. Restore 5s offdelay behavior for now.
-                        *
-                        * Discussion on the issue:
-                        * https://lore.kernel.org/amd-gfx/20260217191632.1243826-1-sysdadmin@m1k.cloud/
-                        */
-                       config.offdelay_ms = 5000;
-                       config.disable_immediate = false;
-               } else if (amdgpu_ip_version(adev, DCE_HWIP, 0) <
-                            IP_VERSION(3, 5, 0)) {
+               if (amdgpu_ip_version(adev, DCE_HWIP, 0) <
+                          IP_VERSION(3, 5, 0) ||
+                          !(adev->flags & AMD_IS_APU)) {
                        /*
                         * Older HW and DGPU have issues with instant off;
                         * use a 2 frame offdelay.