Commit 49ebca79 authored Dec 06, 2018 by wentalou Committed by Alex Deucher Dec 07, 2018

drm/amdgpu: Skip ring soft recovery when fence was NULL



amdgpu_ring_soft_recovery would have Call-Trace,
when s_fence->parent was NULL inside amdgpu_job_timedout.
Check fence first, as drm_sched_hw_job_reset did.

Signed-off-by: Wentao Lou <Wentao.Lou@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

parent 53450efd

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -397,7 +397,7 @@ bool amdgpu_ring_soft_recovery(struct amdgpu_ring *ring, unsigned int vmid,
		{
		ktime_t deadline = ktime_add_us(ktime_get(), 10000);

		if (!ring->funcs->soft_recovery)
		if (!ring->funcs->soft_recovery \|\| !fence)
		return false;

		atomic_inc(&ring->adev->gpu_reset_counter);

Admin message