Commit b3862d60 authored by Jonathan Kim's avatar Jonathan Kim Committed by Alex Deucher
Browse files

drm/amdkfd: limit sdma queue reset caps flagging for gfx9 



ASICs post GFX 9 are being flagged as SDMA per queue reset supported
in the KGD but KFD and scheduler FW currently have no support.
Limit SDMA queue reset capabilities to GFX 9.

Fixes: ceb7114c ("drm/amdkfd: flag per-sdma queue reset supported to user space")
Signed-off-by: default avatarJonathan Kim <jonathan.kim@amd.com>
Reviewed-by: default avatarDavid Belanger <david.belanger@amd.com>
Reviewed-by: default avatarHarish Kasiviswanathan <harish.kasiviswanathan@amd.com>
Reviewed-by: default avatarJesse Zhang <jesse.zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
parent 1c5fdef3

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

+3 −3
Original line number Diff line number Diff line
@@ -1983,9 +1983,6 @@ static void kfd_topology_set_capabilities(struct kfd_topology_device *dev) 
	if (kfd_dbg_has_ttmps_always_setup(dev->gpu))

		dev->node_props.debug_prop |= HSA_DBG_DISPATCH_INFO_ALWAYS_VALID;



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

		dev->node_props.capability2 |= HSA_CAP2_PER_SDMA_QUEUE_RESET_SUPPORTED;



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

		if (KFD_GC_VERSION(dev->gpu) == IP_VERSION(9, 4, 3) ||

		    KFD_GC_VERSION(dev->gpu) == IP_VERSION(9, 4, 4))
@@ -2003,6 +2000,9 @@ 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;