[PATCH 1/2] drm/amdgpu/mes12: use AMDGPU_MES_SCHED_PIPE for legacy map/unmap queues

[Alex Deucher]

We should use the MES_SCHED_PIPE for everything queue related.

Cc: Michael Chen <michael.c...@amd.com>
Cc: Shaoyun Liu <shaoyun....@amd.com>
Signed-off-by: Alex Deucher <alexander.deuc...@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/mes_v12_0.c | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/mes_v12_0.c 
b/drivers/gpu/drm/amd/amdgpu/mes_v12_0.c
index f9f2fbc0a7166..83136fcbd50ff 100644
--- a/drivers/gpu/drm/amd/amdgpu/mes_v12_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/mes_v12_0.c
@@ -498,7 +498,6 @@ static int mes_v12_0_map_legacy_queue(struct amdgpu_mes 
*mes,
                                      struct mes_map_legacy_queue_input *input)
 {
        union MESAPI__ADD_QUEUE mes_add_queue_pkt;
-       int pipe;
 
        memset(&mes_add_queue_pkt, 0, sizeof(mes_add_queue_pkt));
 
@@ -515,12 +514,7 @@ static int mes_v12_0_map_legacy_queue(struct amdgpu_mes 
*mes,
                convert_to_mes_queue_type(input->queue_type);
        mes_add_queue_pkt.map_legacy_kq = 1;
 
-       if (mes->adev->enable_uni_mes)
-               pipe = AMDGPU_MES_KIQ_PIPE;
-       else
-               pipe = AMDGPU_MES_SCHED_PIPE;
-
-       return mes_v12_0_submit_pkt_and_poll_completion(mes, pipe,
+       return mes_v12_0_submit_pkt_and_poll_completion(mes, 
AMDGPU_MES_SCHED_PIPE,
                        &mes_add_queue_pkt, sizeof(mes_add_queue_pkt),
                        offsetof(union MESAPI__ADD_QUEUE, api_status));
 }
@@ -529,7 +523,6 @@ static int mes_v12_0_unmap_legacy_queue(struct amdgpu_mes 
*mes,
                        struct mes_unmap_legacy_queue_input *input)
 {
        union MESAPI__REMOVE_QUEUE mes_remove_queue_pkt;
-       int pipe;
 
        memset(&mes_remove_queue_pkt, 0, sizeof(mes_remove_queue_pkt));
 
@@ -554,12 +547,7 @@ static int mes_v12_0_unmap_legacy_queue(struct amdgpu_mes 
*mes,
                        convert_to_mes_queue_type(input->queue_type);
        }
 
-       if (mes->adev->enable_uni_mes)
-               pipe = AMDGPU_MES_KIQ_PIPE;
-       else
-               pipe = AMDGPU_MES_SCHED_PIPE;
-
-       return mes_v12_0_submit_pkt_and_poll_completion(mes, pipe,
+       return mes_v12_0_submit_pkt_and_poll_completion(mes, 
AMDGPU_MES_SCHED_PIPE,
                        &mes_remove_queue_pkt, sizeof(mes_remove_queue_pkt),
                        offsetof(union MESAPI__REMOVE_QUEUE, api_status));
 }
-- 
2.49.0