[PATCH 1/2] Revert "drm/amdkfd: Add gfx11 queue/pipe reset support to topology"

[PATCH 1/2] Revert "drm/amdkfd: Add gfx11 queue/pipe reset support to topology"

[Amber Lin]

This reverts commit edb0257044b4b762d04542ea26c70673b8a87f2c.

Signed-off-by: Amber Lin <Amber.Lin@amd.com>
---
 drivers/gpu/drm/amd/amdkfd/kfd_priv.h     | 1 -
 drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 3 ---
 2 files changed, 4 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
index 13a021b0e6e5..f00c522fba74 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
@@ -210,7 +210,6 @@ enum cache_policy {
 };
 
 #define KFD_GC_VERSION(dev) (amdgpu_ip_version((dev)->adev, GC_HWIP, 0))
-#define KFD_GC_VERSION_MAJ(dev) ((KFD_GC_VERSION(dev) >> 24))
 #define KFD_IS_SOC15(dev)   ((KFD_GC_VERSION(dev)) >= (IP_VERSION(9, 0, 1)))
 #define KFD_SUPPORT_XNACK_PER_PROCESS(dev)\
 	((KFD_GC_VERSION(dev) == IP_VERSION(9, 4, 2)) ||	\
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
index 6c3734db38ea..0ff793a17857 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
@@ -2024,9 +2024,6 @@ static void kfd_topology_set_capabilities(struct kfd_topology_device *dev)
 			dev->node_props.capability |=
 				HSA_CAP_TRAP_DEBUG_PRECISE_ALU_OPERATIONS_SUPPORTED;
 
-		if (KFD_GC_VERSION_MAJ(dev->gpu) == 11)
-			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;
-- 
2.34.1

[PATCH 2/2] drm/amdkfd: Add queue reset support on gfx11 dGPU

[Amber Lin]

This patch enable queue reset support to KFD topology for gfx11 dGPUs

Signed-off-by: Amber Lin <Amber.Lin@amd.com>
---
 drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
index 0ff793a17857..01a8a2171f8e 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
@@ -2019,6 +2019,11 @@ 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 */
+		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)))
+			dev->node_props.capability |= HSA_CAP_PER_QUEUE_RESET_SUPPORTED;
 
 		if (KFD_GC_VERSION(dev->gpu) >= IP_VERSION(12, 0, 0))
 			dev->node_props.capability |=
-- 
2.34.1

RE: [PATCH 2/2] drm/amdkfd: Add queue reset support on gfx11 dGPU

[Zhang, Jesse(Jie)]

AMD General

Series is Reviewed-by: Jesse.zhang@amd.com

> -----Original Message-----
> From: Lin, Amber <Amber.Lin@amd.com>
> Sent: Saturday, June 13, 2026 11:02 AM
> To: amd-gfx@lists.freedesktop.org; Zhang, Jesse(Jie) <Jesse.Zhang@amd.com>
> Cc: Lin, Amber <Amber.Lin@amd.com>
> Subject: [PATCH 2/2] drm/amdkfd: Add queue reset support on gfx11 dGPU
>
> This patch enable queue reset support to KFD topology for gfx11 dGPUs
>
> Signed-off-by: Amber Lin <Amber.Lin@amd.com>
> ---
>  drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 5 +++++
>  1 file changed, 5 insertions(+)
>
> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
> b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
> index 0ff793a17857..01a8a2171f8e 100644
> --- a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
> @@ -2019,6 +2019,11 @@ 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 */
> +             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)))
> +                     dev->node_props.capability |=
> HSA_CAP_PER_QUEUE_RESET_SUPPORTED;
>
>               if (KFD_GC_VERSION(dev->gpu) >= IP_VERSION(12, 0, 0))
>                       dev->node_props.capability |=
> --
> 2.34.1