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

Add mes mapping legacy queue framework support.

Signed-off-by: Jack Xiao <Jack.Xiao@amd.com>
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c
index 21d1d508ee106ffcead7ab00c2e0d5905d385cbb..5ca5c47ab54ed8ea6afca4c8d43561978c3f8199 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c
@@ -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,

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h
index b99a2b3cffe3fe4b5b8ac54a5d201128c1aa64af..df9f0404d84226518570678b4848604c8f6e9fe2 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h
@@ -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,