Commit 9753078f authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu/sdma6: re-emit unprocessed state on ring reset 



Re-emit the unprocessed state after resetting the queue.

Reviewed-by: default avatarJesse Zhang <Jesse.Zhang@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 1b49bddc

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

+3 −4
Original line number Diff line number Diff line
@@ -1586,7 +1586,7 @@ static int sdma_v6_0_reset_queue(struct amdgpu_ring *ring, 
		return -EINVAL;

	}



	drm_sched_wqueue_stop(&ring->sched);

	amdgpu_ring_reset_helper_begin(ring, timedout_fence);



	r = amdgpu_mes_reset_legacy_queue(adev, ring, vmid, true);

	if (r)
@@ -1595,9 +1595,8 @@ static int sdma_v6_0_reset_queue(struct amdgpu_ring *ring, 
	r = sdma_v6_0_gfx_resume_instance(adev, ring->me, true);

	if (r)

		return r;

	amdgpu_fence_driver_force_completion(ring);

	drm_sched_wqueue_start(&ring->sched);

	return 0;



	return amdgpu_ring_reset_helper_end(ring, timedout_fence);

}



static int sdma_v6_0_set_trap_irq_state(struct amdgpu_device *adev,