Commit 40a9592a authored Oct 04, 2019 by Oak Zeng Committed by Alex Deucher Oct 07, 2019

drm/amdkfd: Fix MQD size calculation



On device initialization, a chunk of GTT memory is pre-allocated for
HIQ and all SDMA queues mqd. The size of this allocation was wrong.
The correct sdma engine number should be PCIe-optimized SDMA engine
number plus xgmi SDMA engine number.

Reported-by: Jonathan Kim <Jonathan.Kim@amd.com>
Signed-off-by: Jonathan Kim <Jonathan.Kim@amd.com>
Signed-off-by: Oak Zeng <Oak.Zeng@amd.com>
Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

parent 1995b3a3

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -1692,7 +1692,8 @@ static int allocate_hiq_sdma_mqd(struct device_queue_manager *dqm)
		struct kfd_dev *dev = dqm->dev;
		struct kfd_mem_obj *mem_obj = &dqm->hiq_sdma_mqd;
		uint32_t size = dqm->mqd_mgrs[KFD_MQD_TYPE_SDMA]->mqd_size *
		dev->device_info->num_sdma_engines *
		(dev->device_info->num_sdma_engines +
		dev->device_info->num_xgmi_sdma_engines) *
		dev->device_info->num_sdma_queues_per_engine +
		dqm->mqd_mgrs[KFD_MQD_TYPE_HIQ]->mqd_size;

Admin message