Skip to content

Commit e9dca96

Browse files
jcornwallAMDalexdeucher
authored andcommitted
drm/amdkfd: Add missing gfx11 MQD manager callbacks
mqd_stride function was introduced in commit 2f77b9a ("drm/amdkfd: Update MQD management on multi XCC setup") but not assigned for gfx11. Fixes a NULL dereference in debugfs. Signed-off-by: Jay Cornwall <jay.cornwall@amd.com> Signed-off-by: Harish Kasiviswanathan <Harish.Kasiviswanathan@amd.com> Acked-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Cc: stable@vger.kernel.org # 6.5.x
1 parent 9f051d6 commit e9dca96

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -457,6 +457,7 @@ struct mqd_manager *mqd_manager_init_v11(enum KFD_MQD_TYPE type,
457457
mqd->is_occupied = kfd_is_occupied_cp;
458458
mqd->mqd_size = sizeof(struct v11_compute_mqd);
459459
mqd->get_wave_state = get_wave_state;
460+
mqd->mqd_stride = kfd_mqd_stride;
460461
#if defined(CONFIG_DEBUG_FS)
461462
mqd->debugfs_show_mqd = debugfs_show_mqd;
462463
#endif
@@ -472,6 +473,7 @@ struct mqd_manager *mqd_manager_init_v11(enum KFD_MQD_TYPE type,
472473
mqd->destroy_mqd = destroy_hiq_mqd;
473474
mqd->is_occupied = kfd_is_occupied_cp;
474475
mqd->mqd_size = sizeof(struct v11_compute_mqd);
476+
mqd->mqd_stride = kfd_mqd_stride;
475477
#if defined(CONFIG_DEBUG_FS)
476478
mqd->debugfs_show_mqd = debugfs_show_mqd;
477479
#endif
@@ -501,6 +503,7 @@ struct mqd_manager *mqd_manager_init_v11(enum KFD_MQD_TYPE type,
501503
mqd->destroy_mqd = kfd_destroy_mqd_sdma;
502504
mqd->is_occupied = kfd_is_occupied_sdma;
503505
mqd->mqd_size = sizeof(struct v11_sdma_mqd);
506+
mqd->mqd_stride = kfd_mqd_stride;
504507
#if defined(CONFIG_DEBUG_FS)
505508
mqd->debugfs_show_mqd = debugfs_show_mqd_sdma;
506509
#endif

0 commit comments

Comments
 (0)