Skip to contentSkip to conversation

drm/amdkfd: Disable queue reset on gfx11 SR-IOV VF

PATCH In review Jesse Zhang 2 participants 2 messages Jun 15

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

PATCH 1/1 drm/amdkfd: Disable queue reset on gfx11 SR-IOV VF

Queue reset is not supported when running as an SR-IOV virtual function on gfx11 dGPUs. Guard HSA_CAP_PER_QUEUE_RESET_SUPPORTED with !amdgpu_sriov_vf() so the capability is not reported to user space under SR-IOV, matching the gfx9/gfx10 path.

Fixes afc0c16db999 ("drm/amdkfd: Add queue reset support on gfx11 dGPU")
---
 drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_topology.c +4 -3
index a9879cf8539e..6a90a3ece9ed 100644
@@ -2020,9 +2020,10 @@ static void kfd_topology_set_capabilities(struct kfd_topology_device *dev)
 		dev->node_props.debug_prop |= HSA_DBG_WATCH_ADDR_MASK_LO_BIT_GFX10 |
 					HSA_DBG_WATCH_ADDR_MASK_HI_BIT;
 		/* gfx11 dGPU */
-		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))
+		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)) &&
+		    !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))
Signature · 1 line
2.49.0
Acked-by on v1 1/1
#1 lore raw
Quoted 10 lines · Jesse Zhang

Queue reset is not supported when running as an SR-IOV virtual function on gfx11 dGPUs. Guard HSA_CAP_PER_QUEUE_RESET_SUPPORTED with !amdgpu_sriov_vf() so the capability is not reported to user space under SR-IOV, matching the gfx9/gfx10 path.

Fixes afc0c16db999 ("drm/amdkfd: Add queue reset support on gfx11 dGPU")

For a future patch we should probably look at doing something like we do for kernel queues for KFD. E.g., amdgpu_ring_is_reset_type_supported()
so we can clean up all of these IP version checks in common code.

Alex

Quoted 25 lines
---
 drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_topology.c +4 -4
index a9879cf8539e..6a90a3ece9ed 100644
@@ -2020,9 +2020,10 @@ static void kfd_topology_set_capabilities(struct kfd_topology_device *dev)
                dev->node_props.debug_prop |= HSA_DBG_WATCH_ADDR_MASK_LO_BIT_GFX10 |
                                        HSA_DBG_WATCH_ADDR_MASK_HI_BIT;
                /* gfx11 dGPU */
-               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))
+               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)) &&
+                   !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))
--

2.49.0