drm/amdkfd: Update packet manager for GFX9.4.3

In GFX 9.4.3, there can be more than 8 SDMA engines.
As a result, extended_engine_sel and engine_sel fields
in MAP_QUEUES packet need to be updated to allow correct
mapping of SDMA queues to these SDMA engines.

Signed-off-by: Mukul Joshi <mukul.joshi@amd.com>
Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_v9.c b/drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_v9.c
index 54d7d46..44cf3a5 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_v9.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_v9.c
@@ -225,9 +225,19 @@ static int pm_map_queues_v9(struct packet_manager *pm, uint32_t *buffer,
                        packet->bitfields2.engine_sel = q->properties.sdma_engine_id +
                                engine_sel__mes_map_queues__sdma0_vi;
                else {
-                       packet->bitfields2.extended_engine_sel =
-                               extended_engine_sel__mes_map_queues__sdma0_to_7_sel;
-                       packet->bitfields2.engine_sel = q->properties.sdma_engine_id;
+                       /*
+                        * For GFX9.4.3, SDMA engine id can be greater than 8.
+                        * For such cases, set extended_engine_sel to 2 and
+                        * ensure engine_sel lies between 0-7.
+                        */
+                       if (q->properties.sdma_engine_id >= 8)
+                               packet->bitfields2.extended_engine_sel =
+                                       extended_engine_sel__mes_map_queues__sdma8_to_15_sel;
+                       else
+                               packet->bitfields2.extended_engine_sel =
+                                       extended_engine_sel__mes_map_queues__sdma0_to_7_sel;
+
+                       packet->bitfields2.engine_sel = q->properties.sdma_engine_id % 8;
                }
                break;
        default:

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_pm4_headers_ai.h b/drivers/gpu/drm/amd/amdkfd/kfd_pm4_headers_ai.h
index a666710..2ad708c 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_pm4_headers_ai.h
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_pm4_headers_ai.h
@@ -263,7 +263,8 @@ enum mes_map_queues_engine_sel_enum {
 
 enum mes_map_queues_extended_engine_sel_enum {
        extended_engine_sel__mes_map_queues__legacy_engine_sel = 0,
-       extended_engine_sel__mes_map_queues__sdma0_to_7_sel = 1
+       extended_engine_sel__mes_map_queues__sdma0_to_7_sel  = 1,
+       extended_engine_sel__mes_map_queues__sdma8_to_15_sel = 2
 };
 
 struct pm4_mes_map_queues {