Commit 567db9e0 authored Dec 14, 2021 by Jonathan Kim Committed by Alex Deucher Jul 12, 2023

drm/amdkfd: restore debugger additional info for gfx v9_4_3



The additional information that the KFD reports to the debugger was
destroyed when the following commit was merged:
"drm/amdkfd: convert switches to IP version checking"

Signed-off-by: Jonathan Kim <jonathan.kim@amd.com>
Reviewed-by: Harish Kasiviswanathan <Harish.Kasiviswanathan@amd.com>
Acked-by: Amber Lin <amber.lin@amd.com>
Signed-off-by: Eric Huang <jinhuieric.huang@amd.com>
Reviewed-by: Jonathan Kim <jonathan.kim@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

parent 036e348f

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

+8 −2

Original line number	Diff line number	Diff line
		@@ -1932,7 +1932,13 @@ static void kfd_topology_set_capabilities(struct kfd_topology_device *dev)
		HSA_CAP_TRAP_DEBUG_WAVE_LAUNCH_MODE_SUPPORTED;

		if (KFD_GC_VERSION(dev->gpu) < IP_VERSION(10, 0, 0)) {
		dev->node_props.debug_prop \|= HSA_DBG_WATCH_ADDR_MASK_LO_BIT_GFX9 \|
		if (KFD_GC_VERSION(dev->gpu) == IP_VERSION(9, 4, 3))
		dev->node_props.debug_prop \|=
		HSA_DBG_WATCH_ADDR_MASK_LO_BIT_GFX9_4_3 \|
		HSA_DBG_WATCH_ADDR_MASK_HI_BIT_GFX9_4_3;
		else
		dev->node_props.debug_prop \|=
		HSA_DBG_WATCH_ADDR_MASK_LO_BIT_GFX9 \|
		HSA_DBG_WATCH_ADDR_MASK_HI_BIT;

		if (KFD_GC_VERSION(dev->gpu) < IP_VERSION(9, 4, 2))

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

+3 −0

Original line number	Diff line number	Diff line
		@@ -32,9 +32,12 @@
		#define KFD_TOPOLOGY_PUBLIC_NAME_SIZE 32

		#define HSA_DBG_WATCH_ADDR_MASK_LO_BIT_GFX9 6
		#define HSA_DBG_WATCH_ADDR_MASK_LO_BIT_GFX9_4_3 7
		#define HSA_DBG_WATCH_ADDR_MASK_LO_BIT_GFX10 7
		#define HSA_DBG_WATCH_ADDR_MASK_HI_BIT \
		(29 << HSA_DBG_WATCH_ADDR_MASK_HI_BIT_SHIFT)
		#define HSA_DBG_WATCH_ADDR_MASK_HI_BIT_GFX9_4_3 \
		(30 << HSA_DBG_WATCH_ADDR_MASK_HI_BIT_SHIFT)

		struct kfd_node_properties {
		uint64_t hive_id;