Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
drm/amdkfd: flag per-sdma queue reset supported to user space
Similar to compute queue reset, flag SDMA queue reset capabilities to
user space for safe testing.
Signed-off-by: Jonathan Kim <jonathan.kim@amd.com>
Reviewed-by: Harish Kasiviswanathan <harish.kasiviswanathan@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
authored by
Jonathan Kim
and committed by
Alex Deucher
ceb7114c
bac38ca8
+9
+5
drivers/gpu/drm/amd/amdkfd/kfd_topology.c
+5
drivers/gpu/drm/amd/amdkfd/kfd_topology.c
···
519
519
dev->gpu->kfd->mec_fw_version);
520
520
sysfs_show_32bit_prop(buffer, offs, "capability",
521
521
dev->node_props.capability);
522
+
sysfs_show_32bit_prop(buffer, offs, "capability2",
523
+
dev->node_props.capability2);
522
524
sysfs_show_64bit_prop(buffer, offs, "debug_prop",
523
525
dev->node_props.debug_prop);
524
526
sysfs_show_32bit_prop(buffer, offs, "sdma_fw_version",
···
1982
1980
1983
1981
if (kfd_dbg_has_ttmps_always_setup(dev->gpu))
1984
1982
dev->node_props.debug_prop |= HSA_DBG_DISPATCH_INFO_ALWAYS_VALID;
1983
+
1984
+
if (dev->gpu->adev->sdma.supported_reset & AMDGPU_RESET_TYPE_PER_QUEUE)
1985
+
dev->node_props.capability2 |= HSA_CAP2_PER_SDMA_QUEUE_RESET_SUPPORTED;
1985
1986
1986
1987
if (KFD_GC_VERSION(dev->gpu) < IP_VERSION(10, 0, 0)) {
1987
1988
if (KFD_GC_VERSION(dev->gpu) == IP_VERSION(9, 4, 3) ||
+1
drivers/gpu/drm/amd/amdkfd/kfd_topology.h
+1
drivers/gpu/drm/amd/amdkfd/kfd_topology.h
+3
include/uapi/linux/kfd_sysfs.h
+3
include/uapi/linux/kfd_sysfs.h
···
63
63
#define HSA_CAP_PER_QUEUE_RESET_SUPPORTED 0x80000000
64
64
#define HSA_CAP_RESERVED 0x000f8000
65
65
66
+
#define HSA_CAP2_PER_SDMA_QUEUE_RESET_SUPPORTED 0x00000001
67
+
#define HSA_CAP2_RESERVED 0xfffffffe
68
+
66
69
/* debug_prop bits in node properties */
67
70
#define HSA_DBG_WATCH_ADDR_MASK_LO_BIT_MASK 0x0000000f
68
71
#define HSA_DBG_WATCH_ADDR_MASK_LO_BIT_SHIFT 0