Commit 734afd4b authored Oct 31, 2018 by Andrey Grodzovsky Committed by Alex Deucher Nov 01, 2018

drm/amdgpu: Fix skipping hangged job reset during gpu recover.



Problem:
During GPU recover DAL would hang in
amdgpu_pm_compute_clocks->amdgpu_fence_wait_empty

Fix:
Turns out there was a typo introduced by
3320b8d2 drm/amdgpu: remove job->ring which caused skipping
amdgpu_fence_driver_force_completion and so the hangged job
was never force signaled and this would cause the hang later in DAL.

Signed-off-by: Andrey Grodzovsky <andrey.grodzovsky@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

parent 1ecd0da5

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -3341,7 +3341,7 @@ int amdgpu_device_gpu_recover(struct amdgpu_device *adev,

		kthread_park(ring->sched.thread);

		if (job && job->base.sched == &ring->sched)
		if (job && job->base.sched != &ring->sched)
		continue;

		drm_sched_hw_job_reset(&ring->sched, job ? &job->base : NULL);