Commit 5d0f619f authored by Jack Xiao's avatar Jack Xiao Committed by Alex Deucher
Browse files

drm/amdgpu/mes: implement adding mes gang 



Gang is a group of the same type queue, which is the scheduling
unit of mes hardware scheduler.

Signed-off-by: default avatarJack Xiao <Jack.Xiao@amd.com>
Acked-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 063a38d6

drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c

+67 −0
Original line number Diff line number Diff line
@@ -349,3 +349,70 @@ void amdgpu_mes_destroy_process(struct amdgpu_device *adev, int pasid) 


	mutex_unlock(&adev->mes.mutex);

}



int amdgpu_mes_add_gang(struct amdgpu_device *adev, int pasid,

			struct amdgpu_mes_gang_properties *gprops,

			int *gang_id)

{

	struct amdgpu_mes_process *process;

	struct amdgpu_mes_gang *gang;

	int r;



	mutex_lock(&adev->mes.mutex);



	process = idr_find(&adev->mes.pasid_idr, pasid);

	if (!process) {

		DRM_ERROR("pasid %d doesn't exist\n", pasid);

		mutex_unlock(&adev->mes.mutex);

		return -EINVAL;

	}



	/* allocate the mes gang buffer */

	gang = kzalloc(sizeof(struct amdgpu_mes_gang), GFP_KERNEL);

	if (!gang) {

		mutex_unlock(&adev->mes.mutex);

		return -ENOMEM;

	}



	/* add the mes gang to idr list */

	r = idr_alloc(&adev->mes.gang_id_idr, gang, 1, 0,

		      GFP_KERNEL);

	if (r < 0) {

		kfree(gang);

		mutex_unlock(&adev->mes.mutex);

		return r;

	}



	gang->gang_id = r;

	*gang_id = r;



	/* allocate the gang context bo and map it to cpu space */

	r = amdgpu_bo_create_kernel(adev, AMDGPU_MES_GANG_CTX_SIZE, PAGE_SIZE,

				    AMDGPU_GEM_DOMAIN_GTT,

				    &gang->gang_ctx_bo,

				    &gang->gang_ctx_gpu_addr,

				    &gang->gang_ctx_cpu_ptr);

	if (r) {

		DRM_ERROR("failed to allocate process context bo\n");

		goto clean_up;

	}

	memset(gang->gang_ctx_cpu_ptr, 0, AMDGPU_MES_GANG_CTX_SIZE);



	INIT_LIST_HEAD(&gang->queue_list);

	gang->process = process;

	gang->priority = gprops->priority;

	gang->gang_quantum = gprops->gang_quantum ?

		gprops->gang_quantum : adev->mes.default_gang_quantum;

	gang->global_priority_level = gprops->global_priority_level;

	gang->inprocess_gang_priority = gprops->inprocess_gang_priority;

	list_add_tail(&gang->list, &process->gang_list);



	mutex_unlock(&adev->mes.mutex);

	return 0;



clean_up:

	idr_remove(&adev->mes.gang_id_idr, gang->gang_id);

	kfree(gang);

	mutex_unlock(&adev->mes.mutex);

	return r;

}

drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h

+12 −0
Original line number Diff line number Diff line
@@ -159,6 +159,14 @@ struct amdgpu_mes_queue { 
	struct amdgpu_ring 		*ring;

};



struct amdgpu_mes_gang_properties {

	uint32_t 	priority;

	uint32_t 	gang_quantum;

	uint32_t 	inprocess_gang_priority;

	uint32_t 	priority_level;

	int 		global_priority_level;

};



struct mes_add_queue_input {

	uint32_t	process_id;

	uint64_t	page_table_base_addr;
@@ -218,4 +226,8 @@ int amdgpu_mes_create_process(struct amdgpu_device *adev, int pasid, 
			      struct amdgpu_vm *vm);

void amdgpu_mes_destroy_process(struct amdgpu_device *adev, int pasid);



int amdgpu_mes_add_gang(struct amdgpu_device *adev, int pasid,

			struct amdgpu_mes_gang_properties *gprops,

			int *gang_id);



#endif /* __AMDGPU_MES_H__ */