Skip to contentSkip to conversation

Revert "drm/amdkfd: Add queue reset support to gfx12.0"

PATCH In review Amber Lin 2 participants 3 messages Jun 24

Subsystems (3)
lore
Share & tools
lore

Amber Lin

author
#0 lore raw

PATCH 1/2 Revert "drm/amdkfd: Add queue reset support to gfx12.0"

This reverts commit ecab22cd95dbde28c17e9eb34416f4c840bd50da. This patch didn't exclude SRIOV

---
 drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_topology.c +2 -3
index f56b55ef1edd..1bf67b6e9aac 100644
@@ -2027,15 +2027,14 @@ static void kfd_topology_set_capabilities(struct kfd_topology_device *dev)
 		     !amdgpu_sriov_vf(dev->gpu->adev))
 			dev->node_props.capability |= HSA_CAP_PER_QUEUE_RESET_SUPPORTED;
 
-		if (KFD_GC_VERSION(dev->gpu) >= IP_VERSION(12, 0, 0)) {
+		if (KFD_GC_VERSION(dev->gpu) >= IP_VERSION(12, 0, 0))
 			dev->node_props.capability |=
 				HSA_CAP_TRAP_DEBUG_PRECISE_ALU_OPERATIONS_SUPPORTED;
-			dev->node_props.capability |= HSA_CAP_PER_QUEUE_RESET_SUPPORTED;
-		}
 
 		if (KFD_GC_VERSION(dev->gpu) >= IP_VERSION(12, 1, 0)) {
 			dev->node_props.capability |=
 				HSA_CAP_TRAP_DEBUG_PRECISE_MEMORY_OPERATIONS_SUPPORTED;
+			dev->node_props.capability |= HSA_CAP_PER_QUEUE_RESET_SUPPORTED;
 			dev->node_props.capability2 |=
 				HSA_CAP2_TRAP_DEBUG_LDS_OUT_OF_ADDR_RANGE_SUPPORTED;
 		}
Signature · 1 line
2.43.0
author
#1 lore raw

PATCH 2/2 drm/amdkfd: Add gfx12.0 queue reset support to topology

This adds queue reset support in KFD topology for gfx12.0.0 and gfx12.0.1 on non-sriov mode.

---
 drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_topology.c +4 -2
index 1bf67b6e9aac..9997ed4e5613 100644
@@ -2020,10 +2020,12 @@ static void kfd_topology_set_capabilities(struct kfd_topology_device *dev)
 	} else {
 		dev->node_props.debug_prop |= HSA_DBG_WATCH_ADDR_MASK_LO_BIT_GFX10 |
 					HSA_DBG_WATCH_ADDR_MASK_HI_BIT;
-		/* gfx11 dGPU */
+		/* gfx11 dGPU and gfx12.0 */
 		if ((KFD_GC_VERSION(dev->gpu) == IP_VERSION(11, 0, 0) ||
 		     KFD_GC_VERSION(dev->gpu) == IP_VERSION(11, 0, 2) ||
-		     KFD_GC_VERSION(dev->gpu) == IP_VERSION(11, 0, 3)) &&
+		     KFD_GC_VERSION(dev->gpu) == IP_VERSION(11, 0, 3) ||
+		     KFD_GC_VERSION(dev->gpu) == IP_VERSION(12, 0, 0) ||
+		     KFD_GC_VERSION(dev->gpu) == IP_VERSION(12, 0, 1)) &&
 		     !amdgpu_sriov_vf(dev->gpu->adev))
 			dev->node_props.capability |= HSA_CAP_PER_QUEUE_RESET_SUPPORTED;
 
Signature · 1 line
2.43.0
Reviewed-by on v1 1/2
#2 lore raw
In reply to Amber Lin

AMD General

Quoted 50 lines

-----Original Message-----
From: Lin, Amber <[email protected]>
Sent: Wednesday, June 24, 2026 11:41 AM
To: [email protected]; Zhang, Jesse(Jie) <[email protected]>
Cc: Lin, Amber <[email protected]>; Lin, Amber <[email protected]>
Subject: [PATCH 1/2] Revert "drm/amdkfd: Add queue reset support to gfx12.0"

This reverts commit ecab22cd95dbde28c17e9eb34416f4c840bd50da. This patch didn't exclude SRIOV

---
 drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_topology.c +1 -3
index f56b55ef1edd..1bf67b6e9aac 100644
@@ -2027,15 +2027,14 @@ static void kfd_topology_set_capabilities(struct
 kfd_topology_device *dev)
                   !amdgpu_sriov_vf(dev->gpu->adev))
                      dev->node_props.capability |=
 HSA_CAP_PER_QUEUE_RESET_SUPPORTED;
 
-             if (KFD_GC_VERSION(dev->gpu) >= IP_VERSION(12, 0, 0)) {
+             if (KFD_GC_VERSION(dev->gpu) >= IP_VERSION(12, 0, 0))
                      dev->node_props.capability |=
 
      HSA_CAP_TRAP_DEBUG_PRECISE_ALU_OPERATIONS_SUPPORTE
 D;
-                     dev->node_props.capability |=
 HSA_CAP_PER_QUEUE_RESET_SUPPORTED;
-             }
 
              if (KFD_GC_VERSION(dev->gpu) >= IP_VERSION(12, 1, 0)) {
                      dev->node_props.capability |=
 
      HSA_CAP_TRAP_DEBUG_PRECISE_MEMORY_OPERATIONS_SUPP

ORTED;
+ dev->node_props.capability |=

HSA_CAP_PER_QUEUE_RESET_SUPPORTED;
                      dev->node_props.capability2 |=

      HSA_CAP2_TRAP_DEBUG_LDS_OUT_OF_ADDR_RANGE_SUPPORT
ED;
              }

--
2.43.0