drm/amdkfd: Delete alloc_format field from map_queue struct

Alloc format was never really supported by MEC FW. FW always
does one per pipe allocation.

Signed-off-by: Oak Zeng <Oak.Zeng@amd.com>
Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>
Signed-off-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_kernel_queue_v9.c b/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_v9.c
index 604570bea6bd928f5e39c7f1b75dec3dedd43b9b..3dd731c69b5d1d47896bf38bee152faea97c5100 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_v9.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_v9.c
@@ -153,8 +153,6 @@ static int pm_map_queues_v9(struct packet_manager *pm, uint32_t *buffer,
 
        packet->header.u32All = pm_build_pm4_header(IT_MAP_QUEUES,
                                        sizeof(struct pm4_mes_map_queues));
-       packet->bitfields2.alloc_format =
-               alloc_format__mes_map_queues__one_per_pipe_vi;
        packet->bitfields2.num_queues = 1;
        packet->bitfields2.queue_sel =
                queue_sel__mes_map_queues__map_to_hws_determined_queue_slots_vi;

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_vi.c b/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_vi.c
index 3cdb19826927a37458f03911e11db706d3618127..2adaf40027eba09867877e46bd948744a35b509d 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_vi.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_vi.c
@@ -190,8 +190,6 @@ static int pm_map_queues_vi(struct packet_manager *pm, uint32_t *buffer,
 
        packet->header.u32All = pm_build_pm4_header(IT_MAP_QUEUES,
                                        sizeof(struct pm4_mes_map_queues));
-       packet->bitfields2.alloc_format =
-               alloc_format__mes_map_queues__one_per_pipe_vi;
        packet->bitfields2.num_queues = 1;
        packet->bitfields2.queue_sel =
                queue_sel__mes_map_queues__map_to_hws_determined_queue_slots_vi;

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 f2bcf5c092ea207c6a20cf0855fb2472348739dc..0661339071f071262ba717527dfd37c93bd2f924 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_pm4_headers_ai.h
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_pm4_headers_ai.h
@@ -255,11 +255,6 @@ enum mes_map_queues_queue_type_enum {
 queue_type__mes_map_queues__low_latency_static_queue_vi = 3
 };
 
-enum mes_map_queues_alloc_format_enum {
-       alloc_format__mes_map_queues__one_per_pipe_vi = 0,
-alloc_format__mes_map_queues__all_on_one_pipe_vi = 1
-};
-
 enum mes_map_queues_engine_sel_enum {
        engine_sel__mes_map_queues__compute_vi = 0,
        engine_sel__mes_map_queues__sdma0_vi = 2,
@@ -279,7 +274,7 @@ struct pm4_mes_map_queues {
                        enum mes_map_queues_queue_sel_enum queue_sel:2;
                        uint32_t reserved2:15;
                        enum mes_map_queues_queue_type_enum queue_type:3;
-                       enum mes_map_queues_alloc_format_enum alloc_format:2;
+                       uint32_t reserved3:2;
                        enum mes_map_queues_engine_sel_enum engine_sel:3;
                        uint32_t num_queues:3;
                } bitfields2;

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_pm4_headers_vi.h b/drivers/gpu/drm/amd/amdkfd/kfd_pm4_headers_vi.h
index 7c8d9b3577490c909a9361be84cb8959494e8c0f..5466cfe1c3cc2b4eaccf1816b9860b93a1951aa7 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_pm4_headers_vi.h
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_pm4_headers_vi.h
@@ -216,11 +216,6 @@ enum mes_map_queues_queue_type_vi_enum {
 queue_type__mes_map_queues__low_latency_static_queue_vi = 3
 };
 
-enum mes_map_queues_alloc_format_vi_enum {
-       alloc_format__mes_map_queues__one_per_pipe_vi = 0,
-alloc_format__mes_map_queues__all_on_one_pipe_vi = 1
-};
-
 enum mes_map_queues_engine_sel_vi_enum {
        engine_sel__mes_map_queues__compute_vi = 0,
        engine_sel__mes_map_queues__sdma0_vi = 2,
@@ -240,7 +235,7 @@ struct pm4_mes_map_queues {
                        enum mes_map_queues_queue_sel_vi_enum queue_sel:2;
                        uint32_t reserved2:15;
                        enum mes_map_queues_queue_type_vi_enum queue_type:3;
-                       enum mes_map_queues_alloc_format_vi_enum alloc_format:2;
+                       uint32_t reserved3:2;
                        enum mes_map_queues_engine_sel_vi_enum engine_sel:3;
                        uint32_t num_queues:3;
                } bitfields2;