Skip to content

Commit 86bde64

Browse files
jokim-amdalexdeucher
authored andcommitted
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: ee0a469 ("drm/amdkfd: support per-queue reset on gfx9") Signed-off-by: Jonathan Kim <[email protected]> Reviewed-by: Alex Deucher <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
1 parent edec9b0 commit 86bde64

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1131,6 +1131,9 @@ uint64_t kgd_gfx_v9_hqd_get_pq_addr(struct amdgpu_device *adev,
11311131
uint32_t low, high;
11321132
uint64_t queue_addr = 0;
11331133

1134+
if (!amdgpu_gpu_recovery)
1135+
return 0;
1136+
11341137
kgd_gfx_v9_acquire_queue(adev, pipe_id, queue_id, inst);
11351138
amdgpu_gfx_rlc_enter_safe_mode(adev, inst);
11361139

@@ -1179,6 +1182,9 @@ uint64_t kgd_gfx_v9_hqd_reset(struct amdgpu_device *adev,
11791182
uint32_t low, high, pipe_reset_data = 0;
11801183
uint64_t queue_addr = 0;
11811184

1185+
if (!amdgpu_gpu_recovery)
1186+
return 0;
1187+
11821188
kgd_gfx_v9_acquire_queue(adev, pipe_id, queue_id, inst);
11831189
amdgpu_gfx_rlc_enter_safe_mode(adev, inst);
11841190

0 commit comments

Comments
 (0)