Commit e9dca969 authored by Jay Cornwall's avatar Jay Cornwall Committed by Alex Deucher
Browse files

drm/amdkfd: Add missing gfx11 MQD manager callbacks 



mqd_stride function was introduced in commit 2f77b9a2
("drm/amdkfd: Update MQD management on multi XCC setup")
but not assigned for gfx11. Fixes a NULL dereference in debugfs.

Signed-off-by: default avatarJay Cornwall <jay.cornwall@amd.com>
Signed-off-by: default avatarHarish Kasiviswanathan <Harish.Kasiviswanathan@amd.com>
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org # 6.5.x
parent 9f051d6f

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

+3 −0
Original line number Diff line number Diff line
@@ -457,6 +457,7 @@ struct mqd_manager *mqd_manager_init_v11(enum KFD_MQD_TYPE type, 
		mqd->is_occupied = kfd_is_occupied_cp;

		mqd->mqd_size = sizeof(struct v11_compute_mqd);

		mqd->get_wave_state = get_wave_state;

		mqd->mqd_stride = kfd_mqd_stride;

#if defined(CONFIG_DEBUG_FS)

		mqd->debugfs_show_mqd = debugfs_show_mqd;

#endif
@@ -472,6 +473,7 @@ struct mqd_manager *mqd_manager_init_v11(enum KFD_MQD_TYPE type, 
		mqd->destroy_mqd = destroy_hiq_mqd;

		mqd->is_occupied = kfd_is_occupied_cp;

		mqd->mqd_size = sizeof(struct v11_compute_mqd);

		mqd->mqd_stride = kfd_mqd_stride;

#if defined(CONFIG_DEBUG_FS)

		mqd->debugfs_show_mqd = debugfs_show_mqd;

#endif
@@ -501,6 +503,7 @@ struct mqd_manager *mqd_manager_init_v11(enum KFD_MQD_TYPE type, 
		mqd->destroy_mqd = kfd_destroy_mqd_sdma;

		mqd->is_occupied = kfd_is_occupied_sdma;

		mqd->mqd_size = sizeof(struct v11_sdma_mqd);

		mqd->mqd_stride = kfd_mqd_stride;

#if defined(CONFIG_DEBUG_FS)

		mqd->debugfs_show_mqd = debugfs_show_mqd_sdma;

#endif