[PATCH 1/5] drm/amdgpu/mes: add mes mapping legacy queue support

[Jack Xiao]

Add mes mapping legacy queue framework support.

Signed-off-by: Jack Xiao <jack.x...@amd.com>
Reviewed-by: Hawking Zhang <hawking.zh...@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c | 22 ++++++++++++++++++++++
 drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h | 14 ++++++++++++++
 2 files changed, 36 insertions(+)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c
index 8783b339066f..b22d50653899 100644
--- 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 b99a2b3cffe3..df9f0404d842 100644
--- 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,
-- 
2.41.0