Skip to contentSkip to conversation

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

PATCH In review Amber Lin 3 participants 3 messages Jun 23 – Jun 24

Subsystems (3)
lore
Share & tools
lore

Amber Lin

author
#0 lore raw

PATCH 1/1 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 f56b55ef1edd..80f7b14a2e47 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
#1 lore raw

AMD General

You can add me as RB

Regards
Shaoyun.liu

-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Amber Lin
Sent: Tuesday, June 23, 2026 10:08 AM
To: [email protected]; Liu, Shaoyun <[email protected]>; Zhang, Jesse(Jie) <[email protected]>
Cc: Lin, Amber <[email protected]>
Subject: [PATCH] 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 f56b55ef1edd..80f7b14a2e47 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;
 

--
2.43.0

#2 lore raw
In reply to Amber Lin

AMD General

Quoted 37 lines

-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Amber Lin
Sent: Tuesday, June 23, 2026 10:08 PM
To: [email protected]; Liu, Shaoyun <[email protected]>; Zhang, Jesse(Jie) <[email protected]>
Cc: Lin, Amber <[email protected]>
Subject: [PATCH] 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 +0 -0
index f56b55ef1edd..80f7b14a2e47 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;
drivers/gpu/drm/amd/amdkfd/kfd_topology.c +4 -2
-             /* 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 |=
Quoted 1 line

HSA_CAP_PER_QUEUE_RESET_SUPPORTED;

We have enabled this queue reset flag for gfx12. Do we need to revert the commit firstly? commit ecab22cd95dbd drm/amdkfd: Add queue reset support to gfx12.0

Jesse

Quoted 3 lines

--
2.43.0