Revert "drm/amd: flush any delayed gfxoff on suspend entry"
authorMario Limonciello <mario.limonciello@amd.com>
Thu, 8 Feb 2024 05:52:54 +0000 (23:52 -0600)
committerAlex Deucher <alexander.deucher@amd.com>
Tue, 13 Feb 2024 13:59:50 +0000 (08:59 -0500)
commitce311df91d73eaddc5489d4d63fb96c21e80f7cf
treecbc8d18bdf9732a64cca1d5b8b33f92968ee5725
parent226db36032c61d8717dfdd052adac351b22d3e83
Revert "drm/amd: flush any delayed gfxoff on suspend entry"

commit ab4750332dbe ("drm/amdgpu/sdma5.2: add begin/end_use ring
callbacks") caused GFXOFF control to be used more heavily and the
codepath that was removed from commit 0dee72639533 ("drm/amd: flush any
delayed gfxoff on suspend entry") now can be exercised at suspend again.

Users report that by using GNOME to suspend the lockscreen trigger will
cause SDMA traffic and the system can deadlock.

This reverts commit 0dee726395333fea833eaaf838bc80962df886c8.

Acked-by: Alex Deucher <alexander.deucher@amd.com>
Fixes: ab4750332dbe ("drm/amdgpu/sdma5.2: add begin/end_use ring callbacks")
Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c