tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Revert "drm/amdgpu: stop scheduler when calling hw_fini (v2)"

This reverts commit f7d6779df642720e22bffd449e683bb8690bd3bf.

This bisected regression has impacted suspend-resume stability
since 5.15-rc1. It regressed -stable via 5.14.10.

Link: https://bugzilla.kernel.org/show_bug.cgi?id=215315
Fixes: f7d6779df64 ("drm/amdgpu: stop scheduler when calling hw_fini (v2)")
Cc: Guchun Chen <guchun.chen@amd.com>
Cc: Andrey Grodzovsky <andrey.grodzovsky@amd.com>
Cc: Christian Koenig <christian.koenig@amd.com>
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: <stable@vger.kernel.org> # 5.14+
Signed-off-by: Len Brown <len.brown@intel.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by Len Brown and committed by Linus Torvalds df5bc0aa 4634129a

options
unified split
Changed files
-8
drivers
gpu
drm
amd
amdgpu
amdgpu_fence.c
-8
drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
··· 547 547 if (!ring || !ring->fence_drv.initialized) 548 548 continue; 549 549 550 - if (!ring->no_scheduler) 551 - drm_sched_stop(&ring->sched, NULL); 552 - 553 550 /* You can't wait for HW to signal if it's gone */ 554 551 if (!drm_dev_is_unplugged(adev_to_drm(adev))) 555 552 r = amdgpu_fence_wait_empty(ring); ··· 605 608 struct amdgpu_ring *ring = adev->rings[i]; 606 609 if (!ring || !ring->fence_drv.initialized) 607 610 continue; 608 - 609 - if (!ring->no_scheduler) { 610 - drm_sched_resubmit_jobs(&ring->sched); 611 - drm_sched_start(&ring->sched, true); 612 - } 613 611 614 612 /* enable the interrupt */ 615 613 if (ring->fence_drv.irq_src)