Commit 0803e7a9 authored by Oak Zeng's avatar Oak Zeng Committed by Alex Deucher
Browse files

drm/amdkfd: Allocate hiq and sdma mqd from mqd trunk 



Instead of allocat hiq and sdma mqd from sub-allocator, allocate
them from a mqd trunk pool. This is done for all asics

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 d1f8f0d1

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

+49 −0
Original line number Diff line number Diff line
@@ -23,6 +23,55 @@ 


#include "kfd_mqd_manager.h"

#include "amdgpu_amdkfd.h"

#include "kfd_device_queue_manager.h"



struct kfd_mem_obj *allocate_hiq_mqd(struct kfd_dev *dev)

{

	struct kfd_mem_obj *mqd_mem_obj = NULL;



	mqd_mem_obj = kzalloc(sizeof(struct kfd_mem_obj), GFP_KERNEL);

	if (!mqd_mem_obj)

		return NULL;



	mqd_mem_obj->gtt_mem = dev->dqm->hiq_sdma_mqd.gtt_mem;

	mqd_mem_obj->gpu_addr = dev->dqm->hiq_sdma_mqd.gpu_addr;

	mqd_mem_obj->cpu_ptr = dev->dqm->hiq_sdma_mqd.cpu_ptr;



	return mqd_mem_obj;

}



struct kfd_mem_obj *allocate_sdma_mqd(struct kfd_dev *dev,

					struct queue_properties *q)

{

	struct kfd_mem_obj *mqd_mem_obj = NULL;

	uint64_t offset;



	mqd_mem_obj = kzalloc(sizeof(struct kfd_mem_obj), GFP_KERNEL);

	if (!mqd_mem_obj)

		return NULL;



	offset = (q->sdma_engine_id *

		dev->device_info->num_sdma_queues_per_engine +

		q->sdma_queue_id) *

		dev->dqm->mqd_mgrs[KFD_MQD_TYPE_SDMA]->mqd_size;



	offset += dev->dqm->mqd_mgrs[KFD_MQD_TYPE_HIQ]->mqd_size;



	mqd_mem_obj->gtt_mem = (void *)((uint64_t)dev->dqm->hiq_sdma_mqd.gtt_mem

				+ offset);

	mqd_mem_obj->gpu_addr = dev->dqm->hiq_sdma_mqd.gpu_addr + offset;

	mqd_mem_obj->cpu_ptr = (uint32_t *)((uint64_t)

				dev->dqm->hiq_sdma_mqd.cpu_ptr + offset);



	return mqd_mem_obj;

}



void uninit_mqd_hiq_sdma(struct mqd_manager *mm, void *mqd,

			struct kfd_mem_obj *mqd_mem_obj)

{

	WARN_ON(!mqd_mem_obj->gtt_mem);

	kfree(mqd_mem_obj);

}



void mqd_symmetrically_map_cu_mask(struct mqd_manager *mm,

		const uint32_t *cu_mask, uint32_t cu_mask_count,

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

+7 −0
Original line number Diff line number Diff line
@@ -102,6 +102,13 @@ struct mqd_manager { 
	uint32_t mqd_size;

};



struct kfd_mem_obj *allocate_hiq_mqd(struct kfd_dev *dev);



struct kfd_mem_obj *allocate_sdma_mqd(struct kfd_dev *dev,

					struct queue_properties *q);

void uninit_mqd_hiq_sdma(struct mqd_manager *mm, void *mqd,

				struct kfd_mem_obj *mqd_mem_obj);



void mqd_symmetrically_map_cu_mask(struct mqd_manager *mm,

		const uint32_t *cu_mask, uint32_t cu_mask_count,

		uint32_t *se_mask);

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

+8 −12
Original line number Diff line number Diff line
@@ -71,6 +71,9 @@ static struct kfd_mem_obj *allocate_mqd(struct kfd_dev *kfd, 
{

	struct kfd_mem_obj *mqd_mem_obj;



	if (q->type == KFD_QUEUE_TYPE_HIQ)

		return allocate_hiq_mqd(kfd);



	if (kfd_gtt_sa_allocate(kfd, sizeof(struct cik_mqd),

			&mqd_mem_obj))

		return NULL;
@@ -148,12 +151,10 @@ static int init_mqd_sdma(struct mqd_manager *mm, void **mqd, 
{

	int retval;

	struct cik_sdma_rlc_registers *m;

	struct kfd_dev *dev = mm->dev;



	retval = kfd_gtt_sa_allocate(mm->dev,

					sizeof(struct cik_sdma_rlc_registers),

					mqd_mem_obj);



	if (retval != 0)

	*mqd_mem_obj = allocate_sdma_mqd(dev, q);

	if (!*mqd_mem_obj)

		return -ENOMEM;



	m = (struct cik_sdma_rlc_registers *) (*mqd_mem_obj)->cpu_ptr;
@@ -175,11 +176,6 @@ static void uninit_mqd(struct mqd_manager *mm, void *mqd, 
	kfd_gtt_sa_free(mm->dev, mqd_mem_obj);

}



static void uninit_mqd_sdma(struct mqd_manager *mm, void *mqd,

				struct kfd_mem_obj *mqd_mem_obj)

{

	kfd_gtt_sa_free(mm->dev, mqd_mem_obj);

}



static int load_mqd(struct mqd_manager *mm, void *mqd, uint32_t pipe_id,

		    uint32_t queue_id, struct queue_properties *p,
@@ -419,7 +415,7 @@ struct mqd_manager *mqd_manager_init_cik(enum KFD_MQD_TYPE type, 
		break;

	case KFD_MQD_TYPE_HIQ:

		mqd->init_mqd = init_mqd_hiq;

		mqd->uninit_mqd = uninit_mqd;

		mqd->uninit_mqd = uninit_mqd_hiq_sdma;

		mqd->load_mqd = load_mqd;

		mqd->update_mqd = update_mqd_hiq;

		mqd->destroy_mqd = destroy_mqd;
@@ -443,7 +439,7 @@ struct mqd_manager *mqd_manager_init_cik(enum KFD_MQD_TYPE type, 
		break;

	case KFD_MQD_TYPE_SDMA:

		mqd->init_mqd = init_mqd_sdma;

		mqd->uninit_mqd = uninit_mqd_sdma;

		mqd->uninit_mqd = uninit_mqd_hiq_sdma;

		mqd->load_mqd = load_mqd_sdma;

		mqd->update_mqd = update_mqd_sdma;

		mqd->destroy_mqd = destroy_mqd_sdma;

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

+8 −14
Original line number Diff line number Diff line
@@ -73,6 +73,9 @@ static struct kfd_mem_obj *allocate_mqd(struct kfd_dev *kfd, 
	int retval;

	struct kfd_mem_obj *mqd_mem_obj = NULL;



	if (q->type == KFD_QUEUE_TYPE_HIQ)

		return allocate_hiq_mqd(kfd);



	/* From V9,  for CWSR, the control stack is located on the next page

	 * boundary after the mqd, we will use the gtt allocation function

	 * instead of sub-allocation function.
@@ -346,13 +349,10 @@ static int init_mqd_sdma(struct mqd_manager *mm, void **mqd, 
{

	int retval;

	struct v9_sdma_mqd *m;

	struct kfd_dev *dev = mm->dev;





	retval = kfd_gtt_sa_allocate(mm->dev,

			sizeof(struct v9_sdma_mqd),

			mqd_mem_obj);



	if (retval != 0)

	*mqd_mem_obj = allocate_sdma_mqd(dev, q);

	if (!*mqd_mem_obj)

		return -ENOMEM;



	m = (struct v9_sdma_mqd *) (*mqd_mem_obj)->cpu_ptr;
@@ -368,12 +368,6 @@ static int init_mqd_sdma(struct mqd_manager *mm, void **mqd, 
	return retval;

}



static void uninit_mqd_sdma(struct mqd_manager *mm, void *mqd,

		struct kfd_mem_obj *mqd_mem_obj)

{

	kfd_gtt_sa_free(mm->dev, mqd_mem_obj);

}



static int load_mqd_sdma(struct mqd_manager *mm, void *mqd,

		uint32_t pipe_id, uint32_t queue_id,

		struct queue_properties *p, struct mm_struct *mms)
@@ -484,7 +478,7 @@ struct mqd_manager *mqd_manager_init_v9(enum KFD_MQD_TYPE type, 
		break;

	case KFD_MQD_TYPE_HIQ:

		mqd->init_mqd = init_mqd_hiq;

		mqd->uninit_mqd = uninit_mqd;

		mqd->uninit_mqd = uninit_mqd_hiq_sdma;

		mqd->load_mqd = load_mqd;

		mqd->update_mqd = update_mqd_hiq;

		mqd->destroy_mqd = destroy_mqd;
@@ -508,7 +502,7 @@ struct mqd_manager *mqd_manager_init_v9(enum KFD_MQD_TYPE type, 
		break;

	case KFD_MQD_TYPE_SDMA:

		mqd->init_mqd = init_mqd_sdma;

		mqd->uninit_mqd = uninit_mqd_sdma;

		mqd->uninit_mqd = uninit_mqd_hiq_sdma;

		mqd->load_mqd = load_mqd_sdma;

		mqd->update_mqd = update_mqd_sdma;

		mqd->destroy_mqd = destroy_mqd_sdma;

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

+8 −14
Original line number Diff line number Diff line
@@ -73,6 +73,9 @@ static struct kfd_mem_obj *allocate_mqd(struct kfd_dev *kfd, 
{

	struct kfd_mem_obj *mqd_mem_obj;



	if (q->type == KFD_QUEUE_TYPE_HIQ)

		return allocate_hiq_mqd(kfd);



	if (kfd_gtt_sa_allocate(kfd, sizeof(struct vi_mqd),

			&mqd_mem_obj))

		return NULL;
@@ -341,13 +344,10 @@ static int init_mqd_sdma(struct mqd_manager *mm, void **mqd, 
{

	int retval;

	struct vi_sdma_mqd *m;

	struct kfd_dev *dev = mm->dev;





	retval = kfd_gtt_sa_allocate(mm->dev,

			sizeof(struct vi_sdma_mqd),

			mqd_mem_obj);



	if (retval != 0)

	*mqd_mem_obj = allocate_sdma_mqd(dev, q);

	if (!*mqd_mem_obj)

		return -ENOMEM;



	m = (struct vi_sdma_mqd *) (*mqd_mem_obj)->cpu_ptr;
@@ -363,12 +363,6 @@ static int init_mqd_sdma(struct mqd_manager *mm, void **mqd, 
	return retval;

}



static void uninit_mqd_sdma(struct mqd_manager *mm, void *mqd,

		struct kfd_mem_obj *mqd_mem_obj)

{

	kfd_gtt_sa_free(mm->dev, mqd_mem_obj);

}



static int load_mqd_sdma(struct mqd_manager *mm, void *mqd,

		uint32_t pipe_id, uint32_t queue_id,

		struct queue_properties *p, struct mm_struct *mms)
@@ -478,7 +472,7 @@ struct mqd_manager *mqd_manager_init_vi(enum KFD_MQD_TYPE type, 
		break;

	case KFD_MQD_TYPE_HIQ:

		mqd->init_mqd = init_mqd_hiq;

		mqd->uninit_mqd = uninit_mqd;

		mqd->uninit_mqd = uninit_mqd_hiq_sdma;

		mqd->load_mqd = load_mqd;

		mqd->update_mqd = update_mqd_hiq;

		mqd->destroy_mqd = destroy_mqd;
@@ -502,7 +496,7 @@ struct mqd_manager *mqd_manager_init_vi(enum KFD_MQD_TYPE type, 
		break;

	case KFD_MQD_TYPE_SDMA:

		mqd->init_mqd = init_mqd_sdma;

		mqd->uninit_mqd = uninit_mqd_sdma;

		mqd->uninit_mqd = uninit_mqd_hiq_sdma;

		mqd->load_mqd = load_mqd_sdma;

		mqd->update_mqd = update_mqd_sdma;

		mqd->destroy_mqd = destroy_mqd_sdma;

CRA Git | Maintained and supported by SUSTech CRA and CCSE