Commit 16631aff authored by Oak Zeng's avatar Oak Zeng Committed by Alex Deucher
Browse files

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: default avatarOak Zeng <Oak.Zeng@amd.com>
Reviewed-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 14568cf6

drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_v9.c

+0 −2
Original line number Diff line number Diff line
@@ -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;

drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_vi.c

+0 −2
Original line number Diff line number Diff line
@@ -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;

drivers/gpu/drm/amd/amdkfd/kfd_pm4_headers_ai.h

+1 −6
Original line number Diff line number Diff line
@@ -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;

drivers/gpu/drm/amd/amdkfd/kfd_pm4_headers_vi.h

+1 −6
Original line number Diff line number Diff line
@@ -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;

CRA Git | Maintained and supported by SUSTech CRA and CCSE