Commit 67ccea60 authored Jul 11, 2018 by Shaoyun Liu Committed by Oded Gabbay Jul 11, 2018

drm/amdgpu: Check NULL pointer for job before reset job's ring



job could be NULL when amdgpu_device_gpu_recover is called

Signed-off-by: Shaoyun Liu <Shaoyun.Liu@amd.com>
Reviewed-by: Andrey Grodzovsky <andrey.grodzovsky@amd.com>
Signed-off-by: Felix Kuehling <Felix.Kuehling@amd.com>
Acked-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Oded Gabbay <oded.gabbay@gmail.com>

parent b5d21aac

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -3325,7 +3325,7 @@ int amdgpu_device_gpu_recover(struct amdgpu_device *adev,
		if (job && job->base.sched == &ring->sched)
		continue;

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

		/* after all hw jobs are reset, hw fence is meaningless, so force_completion */
		amdgpu_fence_driver_force_completion(ring);