diff options
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.19.8/2754-drm-amdkfd-Delete-alloc_format-field-from-map_queue-.patch')
| -rw-r--r-- | common/recipes-kernel/linux/linux-yocto-4.19.8/2754-drm-amdkfd-Delete-alloc_format-field-from-map_queue-.patch | 97 |
1 files changed, 97 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.19.8/2754-drm-amdkfd-Delete-alloc_format-field-from-map_queue-.patch b/common/recipes-kernel/linux/linux-yocto-4.19.8/2754-drm-amdkfd-Delete-alloc_format-field-from-map_queue-.patch new file mode 100644 index 00000000..fa875719 --- /dev/null +++ b/common/recipes-kernel/linux/linux-yocto-4.19.8/2754-drm-amdkfd-Delete-alloc_format-field-from-map_queue-.patch @@ -0,0 +1,97 @@ +From eb02f10170ca32761134aa40357565b9c6d9332e Mon Sep 17 00:00:00 2001 +From: Oak Zeng <Oak.Zeng@amd.com> +Date: Thu, 14 Feb 2019 10:25:42 -0600 +Subject: [PATCH 2754/2940] 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. + +Change-Id: I31337de0069e26690dfb5b1ce34650482f8a6697 +Signed-off-by: Oak Zeng <Oak.Zeng@amd.com> +--- + drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_v9.c | 2 -- + drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_vi.c | 2 -- + drivers/gpu/drm/amd/amdkfd/kfd_pm4_headers_ai.h | 7 +------ + drivers/gpu/drm/amd/amdkfd/kfd_pm4_headers_vi.h | 7 +------ + 4 files changed, 2 insertions(+), 16 deletions(-) + +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 989900449876..3fabc93df1a2 100644 +--- a/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_v9.c ++++ b/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_v9.c +@@ -159,8 +159,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 3cdb19826927..2adaf40027eb 100644 +--- 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 b173d868e824..89f027eb82e7 100644 +--- a/drivers/gpu/drm/amd/amdkfd/kfd_pm4_headers_ai.h ++++ b/drivers/gpu/drm/amd/amdkfd/kfd_pm4_headers_ai.h +@@ -258,11 +258,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, +@@ -282,7 +277,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 7c8d9b357749..5466cfe1c3cc 100644 +--- 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; +-- +2.17.1 + |