Skip to contentSkip to conversation

drm/amdgpu/mes11: set remove_queue_after_reset for reset unmap path

PATCH In review Jesse Zhang 2 participants 2 messages Jun 23 – Jul 13

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/amdgpu/mes11: set remove_queue_after_reset for reset unmap path

In mes_v11_0_unmap_legacy_queue(), set remove_queue_after_reset=1 for RESET_QUEUES.
The queue may already be MMIO-reset. This
flag tells MES to drop internal queue state directly instead of issuing another CP unmap flow, reducing timeout risk during recovery.

---
 drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 5 +++++
 1 file changed, 5 insertions(+)
drivers/gpu/drm/amd/amdgpu/mes_v11_0.c +5 -0
index 9e27d01cbfa3..7bc756ce7aba 100644
@@ -761,6 +761,11 @@ static int mes_v11_0_unmap_legacy_queue(struct amdgpu_mes *mes,
 		mes_remove_queue_pkt.unmap_legacy_queue = 1;
 		mes_remove_queue_pkt.queue_type =
 			convert_to_mes_queue_type(input->queue_type);
+
+		if (input->action == RESET_QUEUES &&
+		    (mes->sched_version & AMDGPU_MES_VERSION_MASK) >= 0x60)
+			mes_remove_queue_pkt.remove_queue_after_reset = 1;
+
 	}
 
 	return mes_v11_0_submit_pkt_and_poll_completion(mes,
Signature · 1 line
2.49.0
Reviewed-by on v1 1/1
#1 lore raw
Quoted 28 lines · Jesse Zhang

In mes_v11_0_unmap_legacy_queue(), set remove_queue_after_reset=1 for RESET_QUEUES.
The queue may already be MMIO-reset. This
flag tells MES to drop internal queue state directly instead of issuing another CP unmap flow, reducing timeout risk during recovery.

---
  drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 5 +++++
  1 file changed, 5 insertions(+)
drivers/gpu/drm/amd/amdgpu/mes_v11_0.c +5 -0
index 9e27d01cbfa3..7bc756ce7aba 100644
@@ -761,6 +761,11 @@ static int mes_v11_0_unmap_legacy_queue(struct amdgpu_mes *mes,
  		mes_remove_queue_pkt.unmap_legacy_queue = 1;
  		mes_remove_queue_pkt.queue_type =
  			convert_to_mes_queue_type(input->queue_type);
+
+		if (input->action == RESET_QUEUES &&
+		    (mes->sched_version & AMDGPU_MES_VERSION_MASK) >= 0x60)
+			mes_remove_queue_pkt.remove_queue_after_reset = 1;
+
  	}
 
  	return mes_v11_0_submit_pkt_and_poll_completion(mes,
Signature · 2 lines
Regards,
Amber