Commit 029c2b03 authored by Jack Xiao's avatar Jack Xiao Committed by Alex Deucher
Browse files

drm/amdgpu/mes: add mes mapping legacy queue support 



Add mes mapping legacy queue framework support.

Signed-off-by: default avatarJack Xiao <Jack.Xiao@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 9a5f15d2

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

+22 −0
Original line number Diff line number Diff line
@@ -786,6 +786,28 @@ int amdgpu_mes_remove_hw_queue(struct amdgpu_device *adev, int queue_id) 
	return 0;

}



int amdgpu_mes_map_legacy_queue(struct amdgpu_device *adev,

				struct amdgpu_ring *ring)

{

	struct mes_map_legacy_queue_input queue_input;

	int r;



	memset(&queue_input, 0, sizeof(queue_input));



	queue_input.queue_type = ring->funcs->type;

	queue_input.doorbell_offset = ring->doorbell_index;

	queue_input.pipe_id = ring->pipe;

	queue_input.queue_id = ring->queue;

	queue_input.mqd_addr = amdgpu_bo_gpu_offset(ring->mqd_obj);

	queue_input.wptr_addr = ring->wptr_gpu_addr;



	r = adev->mes.funcs->map_legacy_queue(&adev->mes, &queue_input);

	if (r)

		DRM_ERROR("failed to map legacy queue\n");



	return r;

}



int amdgpu_mes_unmap_legacy_queue(struct amdgpu_device *adev,

				  struct amdgpu_ring *ring,

				  enum amdgpu_unmap_queues_action action,

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

+14 −0
Original line number Diff line number Diff line
@@ -248,6 +248,15 @@ struct mes_remove_queue_input { 
	uint64_t	gang_context_addr;

};



struct mes_map_legacy_queue_input {

	uint32_t                           queue_type;

	uint32_t                           doorbell_offset;

	uint32_t                           pipe_id;

	uint32_t                           queue_id;

	uint64_t                           mqd_addr;

	uint64_t                           wptr_addr;

};



struct mes_unmap_legacy_queue_input {

	enum amdgpu_unmap_queues_action    action;

	uint32_t                           queue_type;
@@ -324,6 +333,9 @@ struct amdgpu_mes_funcs { 
	int (*remove_hw_queue)(struct amdgpu_mes *mes,

			       struct mes_remove_queue_input *input);



	int (*map_legacy_queue)(struct amdgpu_mes *mes,

				struct mes_map_legacy_queue_input *input);



	int (*unmap_legacy_queue)(struct amdgpu_mes *mes,

				  struct mes_unmap_legacy_queue_input *input);
@@ -367,6 +379,8 @@ int amdgpu_mes_add_hw_queue(struct amdgpu_device *adev, int gang_id, 
			    int *queue_id);

int amdgpu_mes_remove_hw_queue(struct amdgpu_device *adev, int queue_id);



int amdgpu_mes_map_legacy_queue(struct amdgpu_device *adev,

				struct amdgpu_ring *ring);

int amdgpu_mes_unmap_legacy_queue(struct amdgpu_device *adev,

				  struct amdgpu_ring *ring,

				  enum amdgpu_unmap_queues_action action,