Commit a55737da authored by Jesse.Zhang's avatar Jesse.Zhang Committed by Alex Deucher
Browse files

drm/amdkfd: move SDMA queue reset capability check to node_show 



Relocate the per-SDMA queue reset capability check from
kfd_topology_set_capabilities() to node_show() to ensure we read the
latest value of sdma.supported_reset after all IP blocks are initialized.

Fixes: ceb7114c ("drm/amdkfd: flag per-sdma queue reset supported to user space")
Reviewed-by: default avatarJonathan Kim <jonathan.kim@amd.com>
Signed-off-by: default avatarJesse Zhang <Jesse.Zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
(cherry picked from commit e17df7b0)
parent e04c78d8

drivers/gpu/drm/amd/amdkfd/kfd_topology.c

+4 −2
Original line number Diff line number Diff line
@@ -510,6 +510,10 @@ static ssize_t node_show(struct kobject *kobj, struct attribute *attr, 
			dev->node_props.capability |=

					HSA_CAP_AQL_QUEUE_DOUBLE_MAP;



		if (KFD_GC_VERSION(dev->gpu) < IP_VERSION(10, 0, 0) &&

			(dev->gpu->adev->sdma.supported_reset & AMDGPU_RESET_TYPE_PER_QUEUE))

				dev->node_props.capability2 |= HSA_CAP2_PER_SDMA_QUEUE_RESET_SUPPORTED;



		sysfs_show_32bit_prop(buffer, offs, "max_engine_clk_fcompute",

			dev->node_props.max_engine_clk_fcompute);
@@ -2008,8 +2012,6 @@ static void kfd_topology_set_capabilities(struct kfd_topology_device *dev) 
		if (!amdgpu_sriov_vf(dev->gpu->adev))

			dev->node_props.capability |= HSA_CAP_PER_QUEUE_RESET_SUPPORTED;



		if (dev->gpu->adev->sdma.supported_reset & AMDGPU_RESET_TYPE_PER_QUEUE)

			dev->node_props.capability2 |= HSA_CAP2_PER_SDMA_QUEUE_RESET_SUPPORTED;

	} else {

		dev->node_props.debug_prop |= HSA_DBG_WATCH_ADDR_MASK_LO_BIT_GFX10 |

					HSA_DBG_WATCH_ADDR_MASK_HI_BIT;