Skip to content

Commit df5bc0a

Browse files
lenbtorvalds
authored andcommitted
Revert "drm/amdgpu: stop scheduler when calling hw_fini (v2)"
This reverts commit f7d6779. 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: f7d6779 ("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>
1 parent 4634129 commit df5bc0a

1 file changed

Lines changed: 0 additions & 8 deletions

File tree

drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -547,9 +547,6 @@ void amdgpu_fence_driver_hw_fini(struct amdgpu_device *adev)
547547
if (!ring || !ring->fence_drv.initialized)
548548
continue;
549549

550-
if (!ring->no_scheduler)
551-
drm_sched_stop(&ring->sched, NULL);
552-
553550
/* You can't wait for HW to signal if it's gone */
554551
if (!drm_dev_is_unplugged(adev_to_drm(adev)))
555552
r = amdgpu_fence_wait_empty(ring);
@@ -609,11 +606,6 @@ void amdgpu_fence_driver_hw_init(struct amdgpu_device *adev)
609606
if (!ring || !ring->fence_drv.initialized)
610607
continue;
611608

612-
if (!ring->no_scheduler) {
613-
drm_sched_resubmit_jobs(&ring->sched);
614-
drm_sched_start(&ring->sched, true);
615-
}
616-
617609
/* enable the interrupt */
618610
if (ring->fence_drv.irq_src)
619611
amdgpu_irq_get(adev, ring->fence_drv.irq_src,

0 commit comments

Comments
 (0)