drm/amdgpu: Fix per queue reset on MES 12.1
Subsystems (2)
PATCH 1/2 drm/amdgpu: Fix per queue reset on MES 12.1
Different from detect_and_reset, reset_hw_queue performs per queue reset by sending reset_queue_only=1 and hung queue's doorbell_offset to MES in RESET packet. enable_compute_pipe_reset=1 also needs to be set in SET_HW_RESOURCES so when queue reset fails, MES will proceed pipe reset.
This patch also fix a bug in mes_v12_1_reset_hw_queue function. Instead of using MESAPI__RESET offset for api_status, the existing code uses MESAPI__REMOVE_QUEUE.
Signed-off-by Amber Lin <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/mes_v12_1.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/mes_v12_1.c +4 -2
@@ -388,7 +388,7 @@ static int mes_v12_1_reset_hw_queue(struct amdgpu_mes *mes, mes_reset_queue_pkt.doorbell_offset = input->doorbell_offset;/* mes_reset_queue_pkt.gang_context_addr = input->gang_context_addr; */ -/*mes_reset_queue_pkt.reset_queue_only = 1;*/ + mes_reset_queue_pkt.reset_queue_only =1 ;if (mes->adev->enable_uni_mes) pipe =AMDGPU_MES_KIQ_PIPE ;
@@ -398,7 +398,7 @@ static int mes_v12_1_reset_hw_queue(struct amdgpu_mes *mes,return mes_v12_1_submit_pkt_and_poll_completion (mes, input->xcc_id, pipe, &mes_reset_queue_pkt,sizeof (mes_reset_queue_pkt), - offsetof(union MESAPI__REMOVE_QUEUE , api_status)); + offsetof(union MESAPI__RESET , api_status)); } static int mes_v12_1_map_legacy_queue(struct amdgpu_mes *mes,
@@ -743,6 +743,8 @@ static int mes_v12_1_set_hw_resources(struct amdgpu_mes *mes, mes_set_hw_res_pkt.use_different_vmid_compute =1 ; mes_set_hw_res_pkt.enable_reg_active_poll =1 ; mes_set_hw_res_pkt.enable_level_process_quantum_check =1 ; +/* proceeds pipe reset if queue reset fails */ + mes_set_hw_res_pkt.enable_compute_pipe_reset =1 ;/* * Keep oversubscribe timer for sdma . When we have unmapped doorbell
Signature · 1 line
2.43.0
PATCH 2/2 drm/amdgpu: Set queue reset method for GC 12.1
EXplicitely setting use_mmio_for_reset = false in gfx_v12_1_sw_init for using MES to perform queue/pipe reset
Signed-off-by Amber Lin <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/gfx_v12_1.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/amd/amdgpu/gfx_v12_1.c +3 -0
@@ -1560,6 +1560,9 @@ static int gfx_v12_1_sw_init(struct amdgpu_ip_block *ip_block)gfx_v12_1_alloc_ip_dump (adev); + adev->gfx.me.use_mmio_for_reset = false; + adev->gfx.mec.use_mmio_for_reset = false; +mutex_init (&adev->gfx.mec.reset_mutex);return 0 ;
Signature · 1 line
2.43.0