Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 11614c36 authored by Oak Zeng's avatar Oak Zeng Committed by Alex Deucher
Browse files

drm/amdkfd: Allocate MQD trunk for HIQ and SDMA 



MEC FW for some new asic requires all SDMA MQDs to be in a continuous
trunk of memory right after HIQ MQD. Add a field in device queue manager
to hold the HIQ/SDMA MQD memory object and allocate MQD trunk on device
queue manager initialization.

Signed-off-by: default avatarOak Zeng <ozeng@amd.com>
Reviewed-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 6c6cde55

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

+32 −0
Original line number Diff line number Diff line
@@ -1621,6 +1621,25 @@ static int init_mqd_managers(struct device_queue_manager *dqm) 


	return -ENOMEM;

}



/* Allocate one hiq mqd (HWS) and all SDMA mqd in a continuous trunk*/

static int allocate_hiq_sdma_mqd(struct device_queue_manager *dqm)

{

	int retval;

	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_queues_per_engine +

		dqm->mqd_mgrs[KFD_MQD_TYPE_HIQ]->mqd_size;



	retval = amdgpu_amdkfd_alloc_gtt_mem(dev->kgd, size,

		&(mem_obj->gtt_mem), &(mem_obj->gpu_addr),

		(void *)&(mem_obj->cpu_ptr), true);



	return retval;

}



struct device_queue_manager *device_queue_manager_init(struct kfd_dev *dev)

{

	struct device_queue_manager *dqm;
@@ -1730,6 +1749,11 @@ struct device_queue_manager *device_queue_manager_init(struct kfd_dev *dev) 
	if (init_mqd_managers(dqm))

		goto out_free;



	if (allocate_hiq_sdma_mqd(dqm)) {

		pr_err("Failed to allocate hiq sdma mqd trunk buffer\n");

		goto out_free;

	}



	if (!dqm->ops.initialize(dqm))

		return dqm;
@@ -1738,9 +1762,17 @@ struct device_queue_manager *device_queue_manager_init(struct kfd_dev *dev) 
	return NULL;

}



void deallocate_hiq_sdma_mqd(struct kfd_dev *dev, struct kfd_mem_obj *mqd)

{

	WARN(!mqd, "No hiq sdma mqd trunk to free");



	amdgpu_amdkfd_free_gtt_mem(dev->kgd, mqd->gtt_mem);

}



void device_queue_manager_uninit(struct device_queue_manager *dqm)

{

	dqm->ops.uninitialize(dqm);

	deallocate_hiq_sdma_mqd(dqm->dev, &dqm->hiq_sdma_mqd);

	kfree(dqm);

}

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

+1 −0
Original line number Diff line number Diff line
@@ -197,6 +197,7 @@ struct device_queue_manager { 
	/* hw exception  */

	bool			is_hws_hang;

	struct work_struct	hw_exception_work;

	struct kfd_mem_obj	hiq_sdma_mqd;

};



void device_queue_manager_init_cik(