Commit f7d6779d authored by Guchun Chen's avatar Guchun Chen Committed by Alex Deucher
Browse files

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



This gurantees no more work on the ring can be submitted
to hardware in suspend/resume case, otherwise a potential
race will occur and the ring will get no chance to stay
empty before suspend.

v2: Call drm_sched_resubmit_job before drm_sched_start to
restart jobs from the pending list.

Suggested-by: default avatarAndrey Grodzovsky <andrey.grodzovsky@amd.com>
Suggested-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarGuchun Chen <guchun.chen@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
parent 156872b0

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

+8 −0
Original line number Diff line number Diff line
@@ -552,6 +552,9 @@ 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->ddev))

			r = amdgpu_fence_wait_empty(ring);
@@ -611,6 +614,11 @@ 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,