Skip to content

Commit f39283e

Browse files
leo-sunli1alexdeucher
authored andcommitted
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 a1fc7bf. 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 f64a9be) Cc: stable@vger.kernel.org # 8382cd2: drm/amd/display: consolidate DCN vblank/flip handling onto vupdate_no_lock Cc: stable@vger.kernel.org # 48ab863: drm/amd/display: check GRPH_FLIP status before sending event Cc: stable@vger.kernel.org
1 parent 48ab863 commit f39283e

1 file changed

Lines changed: 3 additions & 15 deletions

File tree

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

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9675,21 +9675,9 @@ static void manage_dm_interrupts(struct amdgpu_device *adev,
96759675
if (acrtc_state) {
96769676
timing = &acrtc_state->stream->timing;
96779677

9678-
if (amdgpu_ip_version(adev, DCE_HWIP, 0) >=
9679-
IP_VERSION(3, 2, 0) &&
9680-
!(adev->flags & AMD_IS_APU)) {
9681-
/*
9682-
* DGPUs NV3x and newer that support idle optimizations
9683-
* experience intermittent flip-done timeouts on cursor
9684-
* updates. Restore 5s offdelay behavior for now.
9685-
*
9686-
* Discussion on the issue:
9687-
* https://lore.kernel.org/amd-gfx/20260217191632.1243826-1-sysdadmin@m1k.cloud/
9688-
*/
9689-
config.offdelay_ms = 5000;
9690-
config.disable_immediate = false;
9691-
} else if (amdgpu_ip_version(adev, DCE_HWIP, 0) <
9692-
IP_VERSION(3, 5, 0)) {
9678+
if (amdgpu_ip_version(adev, DCE_HWIP, 0) <
9679+
IP_VERSION(3, 5, 0) ||
9680+
!(adev->flags & AMD_IS_APU)) {
96939681
/*
96949682
* Older HW and DGPU have issues with instant off;
96959683
* use a 2 frame offdelay.

0 commit comments

Comments
 (0)