Commit 86bde64c authored by Jonathan Kim's avatar Jonathan Kim Committed by Alex Deucher
Browse files

drm/amdgpu: fix gpu recovery disable with per queue reset 



Per queue reset should be bypassed when gpu recovery is disabled
with module parameter.

Fixes: ee0a469c ("drm/amdkfd: support per-queue reset on gfx9")
Signed-off-by: default avatarJonathan Kim <jonathan.kim@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent edec9b06

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

+6 −0
Original line number Diff line number Diff line
@@ -1131,6 +1131,9 @@ uint64_t kgd_gfx_v9_hqd_get_pq_addr(struct amdgpu_device *adev, 
	uint32_t low, high;

	uint64_t queue_addr = 0;



	if (!amdgpu_gpu_recovery)

		return 0;



	kgd_gfx_v9_acquire_queue(adev, pipe_id, queue_id, inst);

	amdgpu_gfx_rlc_enter_safe_mode(adev, inst);
@@ -1179,6 +1182,9 @@ uint64_t kgd_gfx_v9_hqd_reset(struct amdgpu_device *adev, 
	uint32_t low, high, pipe_reset_data = 0;

	uint64_t queue_addr = 0;



	if (!amdgpu_gpu_recovery)

		return 0;



	kgd_gfx_v9_acquire_queue(adev, pipe_id, queue_id, inst);

	amdgpu_gfx_rlc_enter_safe_mode(adev, inst);