[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....@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