Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: ee0a469cf917 ("drm/amdkfd: support per-queue reset on gfx9")
Signed-off-by: Jonathan Kim <jonathan.kim@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Jonathan Kim and committed by
Alex Deucher
86bde64c edec9b06

+6
+6
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c
··· 1131 1131 uint32_t low, high; 1132 1132 uint64_t queue_addr = 0; 1133 1133 1134 + if (!amdgpu_gpu_recovery) 1135 + return 0; 1136 + 1134 1137 kgd_gfx_v9_acquire_queue(adev, pipe_id, queue_id, inst); 1135 1138 amdgpu_gfx_rlc_enter_safe_mode(adev, inst); 1136 1139 ··· 1181 1178 { 1182 1179 uint32_t low, high, pipe_reset_data = 0; 1183 1180 uint64_t queue_addr = 0; 1181 + 1182 + if (!amdgpu_gpu_recovery) 1183 + return 0; 1184 1184 1185 1185 kgd_gfx_v9_acquire_queue(adev, pipe_id, queue_id, inst); 1186 1186 amdgpu_gfx_rlc_enter_safe_mode(adev, inst);