Commit df5bc0aa authored by Len Brown's avatar Len Brown Committed by Linus Torvalds
Browse files

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

This reverts commit f7d6779d.

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: f7d6779d ("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: default avatarLen Brown <len.brown@intel.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 4634129a

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

+0 −8
Original line number Diff line number Diff line
@@ -547,9 +547,6 @@ void amdgpu_fence_driver_hw_fini(struct amdgpu_device *adev) 
		if (!ring || !ring->fence_drv.initialized)

			continue;



		if (!ring->no_scheduler)

			drm_sched_stop(&ring->sched, NULL);



		/* You can't wait for HW to signal if it's gone */

		if (!drm_dev_is_unplugged(adev_to_drm(adev)))

			r = amdgpu_fence_wait_empty(ring);
@@ -609,11 +606,6 @@ void amdgpu_fence_driver_hw_init(struct amdgpu_device *adev) 
		if (!ring || !ring->fence_drv.initialized)

			continue;



		if (!ring->no_scheduler) {

			drm_sched_resubmit_jobs(&ring->sched);

			drm_sched_start(&ring->sched, true);

		}



		/* enable the interrupt */

		if (ring->fence_drv.irq_src)

			amdgpu_irq_get(adev, ring->fence_drv.irq_src,