drm/amdgpu: Add gfx12.0.1 adev to queue reset support
Subsystems (3)
PATCH 1/2 drm/amdgpu: Add gfx12.0.1 adev to queue reset support
This patch adds the inclusion of gfx12.0.1 by cheching GC's major number and minor number equal to 12.0.* with the same mes_sched version.
Signed-off-by Amber Lin <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c +7 -6
@@ -864,12 +864,13 @@ bool amdgpu_mes_suspend_resume_all_supported(struct amdgpu_device *adev)bool amdgpu_mes_queue_reset_by_mes_supported (struct amdgpu_device *adev) { -return (amdgpu_ip_version (adev,GC_HWIP ,0 ) ==IP_VERSION (12 ,1 ,0 ) && - (adev->mes.sched_version &AMDGPU_MES_VERSION_MASK ) >=0x73 ) || - (IP_VERSION_MAJ (amdgpu_ip_version (adev,GC_HWIP ,0 )) ==11 && - (adev->mes.sched_version &AMDGPU_MES_VERSION_MASK ) >=0x8c ) || - (amdgpu_ip_version (adev,GC_HWIP ,0 ) ==IP_VERSION (12 ,0 ,0 ) && - (adev->mes.sched_version &AMDGPU_MES_VERSION_MASK ) >=0x8d ); +u32 ip_maj =IP_VERSION_MAJ (amdgpu_ip_version (adev,GC_HWIP ,0 )); +u32 ip_min =IP_VERSION_MIN (amdgpu_ip_version (adev,GC_HWIP ,0 )); +u32 mes_sched = adev->mes.sched_version &AMDGPU_MES_VERSION_MASK ; + +return (ip_maj ==11 && mes_sched >=0x8c ) || + ((ip_maj ==12 && ip_min ==0 ) && mes_sched >=0x8d ) || + ((ip_maj ==12 && ip_min ==1 ) && mes_sched >=0x73 ); }/* Fix me -- node_id is used to identify the correct MES instances in the future */
Signature · 1 line
2.34.1
PATCH 2/2 drm/amdkfd: Add queue reset support to gfx12.0
This adds gfx 12.0 queue reset support to KFD topology.
Signed-off-by Amber Lin <[email protected]>
--- drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_topology.c +3 -2
@@ -2025,14 +2025,15 @@ static void kfd_topology_set_capabilities(struct kfd_topology_device *dev) 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 )) +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.34.1