aboutsummaryrefslogtreecommitdiffstats
path: root/common/recipes-kernel/linux/linux-yocto-4.14.71/1329-drm-amdkfd-Clean-up-process-queue-management.patch
diff options
context:
space:
mode:
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.14.71/1329-drm-amdkfd-Clean-up-process-queue-management.patch')
-rw-r--r--common/recipes-kernel/linux/linux-yocto-4.14.71/1329-drm-amdkfd-Clean-up-process-queue-management.patch204
1 files changed, 204 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.14.71/1329-drm-amdkfd-Clean-up-process-queue-management.patch b/common/recipes-kernel/linux/linux-yocto-4.14.71/1329-drm-amdkfd-Clean-up-process-queue-management.patch
new file mode 100644
index 00000000..6c982920
--- /dev/null
+++ b/common/recipes-kernel/linux/linux-yocto-4.14.71/1329-drm-amdkfd-Clean-up-process-queue-management.patch
@@ -0,0 +1,204 @@
+From a1ce8552cab62477e6b33a615cdae2f6b6beb50c Mon Sep 17 00:00:00 2001
+From: Felix Kuehling <Felix.Kuehling@amd.com>
+Date: Mon, 21 Aug 2017 17:59:31 -0400
+Subject: [PATCH 1329/4131] drm/amdkfd: Clean up process queue management
+
+Removed unused num_concurrent_processes.
+
+Implemented counting of queues in QPD. This makes counting the queue
+list repeatedly in several places unnecessary.
+
+Change-Id: I8a162f33687b4c6ca66ffd180cfb95412e8afec6
+Signed-off-by: Felix Kuehling <Felix.Kuehling@amd.com>
+---
+ drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 5 +++++
+ drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_cik.c | 14 ++------------
+ drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_v9.c | 8 +-------
+ drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_vi.c | 7 +------
+ drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 1 -
+ drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 9 ++-------
+ 6 files changed, 11 insertions(+), 33 deletions(-)
+
+diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
+index 020aa9b..00b8c79 100644
+--- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
++++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
+@@ -277,6 +277,7 @@ static int create_queue_nocpsch(struct device_queue_manager *dqm,
+ }
+
+ list_add(&q->list, &qpd->queues_list);
++ qpd->queue_count++;
+ if (q->properties.is_active)
+ dqm->queue_count++;
+
+@@ -439,6 +440,7 @@ static int destroy_queue_nocpsch_locked(struct device_queue_manager *dqm,
+
+ deallocate_vmid(dqm, qpd, q);
+ }
++ qpd->queue_count--;
+ if (q->properties.is_active)
+ dqm->queue_count--;
+
+@@ -1124,6 +1126,7 @@ static int create_queue_cpsch(struct device_queue_manager *dqm, struct queue *q,
+ goto out_deallocate_doorbell;
+
+ list_add(&q->list, &qpd->queues_list);
++ qpd->queue_count++;
+ if (q->properties.is_active) {
+ dqm->queue_count++;
+ retval = execute_queues_cpsch(dqm, false, false);
+@@ -1312,6 +1315,7 @@ static int destroy_queue_cpsch(struct device_queue_manager *dqm,
+ }
+
+ list_del(&q->list);
++ qpd->queue_count--;
+ if (q->properties.is_active)
+ dqm->queue_count--;
+
+@@ -1559,6 +1563,7 @@ static int process_termination_cpsch(struct device_queue_manager *dqm,
+ goto out;
+ }
+ list_del(&q->list);
++ qpd->queue_count--;
+ mqd->uninit_mqd(mqd, q->mqd, q->mqd_mem_obj);
+ }
+
+diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_cik.c b/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_cik.c
+index 2e4c6fb..2808422 100644
+--- a/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_cik.c
++++ b/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_cik.c
+@@ -58,8 +58,6 @@ static int pm_map_process_cik(struct packet_manager *pm, uint32_t *buffer,
+ struct qcm_process_device *qpd)
+ {
+ struct pm4_map_process *packet;
+- struct queue *cur;
+- uint32_t num_queues;
+
+ packet = (struct pm4_map_process *)buffer;
+
+@@ -74,10 +72,7 @@ static int pm_map_process_cik(struct packet_manager *pm, uint32_t *buffer,
+ packet->bitfields10.gds_size = qpd->gds_size;
+ packet->bitfields10.num_gws = qpd->num_gws;
+ packet->bitfields10.num_oac = qpd->num_oac;
+- num_queues = 0;
+- list_for_each_entry(cur, &qpd->queues_list, list)
+- num_queues++;
+- packet->bitfields10.num_queues = (qpd->is_debug) ? 0 : num_queues;
++ packet->bitfields10.num_queues = (qpd->is_debug) ? 0 : qpd->queue_count;
+
+ packet->sh_mem_config = qpd->sh_mem_config;
+ packet->sh_mem_bases = qpd->sh_mem_bases;
+@@ -94,8 +89,6 @@ static int pm_map_process_scratch_cik(struct packet_manager *pm,
+ uint32_t *buffer, struct qcm_process_device *qpd)
+ {
+ struct pm4_map_process_scratch_kv *packet;
+- struct queue *cur;
+- uint32_t num_queues;
+
+ packet = (struct pm4_map_process_scratch_kv *)buffer;
+
+@@ -110,10 +103,7 @@ static int pm_map_process_scratch_cik(struct packet_manager *pm,
+ packet->bitfields14.gds_size = qpd->gds_size;
+ packet->bitfields14.num_gws = qpd->num_gws;
+ packet->bitfields14.num_oac = qpd->num_oac;
+- num_queues = 0;
+- list_for_each_entry(cur, &qpd->queues_list, list)
+- num_queues++;
+- packet->bitfields14.num_queues = (qpd->is_debug) ? 0 : num_queues;
++ packet->bitfields14.num_queues = (qpd->is_debug) ? 0 : qpd->queue_count;
+
+ packet->sh_mem_config = qpd->sh_mem_config;
+ packet->sh_mem_bases = qpd->sh_mem_bases;
+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 367cbdf..5fe4f60 100644
+--- a/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_v9.c
++++ b/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_v9.c
+@@ -71,8 +71,6 @@ static int pm_map_process_v9(struct packet_manager *pm,
+ uint32_t *buffer, struct qcm_process_device *qpd)
+ {
+ struct pm4_mes_map_process *packet;
+- struct queue *cur;
+- uint32_t num_queues;
+ uint64_t vm_page_table_base_addr =
+ (uint64_t)(qpd->page_table_base) << 12;
+
+@@ -88,11 +86,7 @@ static int pm_map_process_v9(struct packet_manager *pm,
+ packet->bitfields14.num_gws = qpd->num_gws;
+ packet->bitfields14.num_oac = qpd->num_oac;
+ packet->bitfields14.sdma_enable = 1;
+-
+- num_queues = 0;
+- list_for_each_entry(cur, &qpd->queues_list, list)
+- num_queues++;
+- packet->bitfields14.num_queues = (qpd->is_debug) ? 0 : num_queues;
++ packet->bitfields14.num_queues = (qpd->is_debug) ? 0 : qpd->queue_count;
+
+ packet->sh_mem_config = qpd->sh_mem_config;
+ packet->sh_mem_bases = qpd->sh_mem_bases;
+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 b123c4a..ecf4a33 100644
+--- a/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_vi.c
++++ b/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_vi.c
+@@ -71,8 +71,6 @@ static int pm_map_process_vi(struct packet_manager *pm,
+ uint32_t *buffer, struct qcm_process_device *qpd)
+ {
+ struct pm4_mes_map_process *packet;
+- struct queue *cur;
+- uint32_t num_queues;
+
+ packet = (struct pm4_mes_map_process *)buffer;
+ memset(buffer, 0, sizeof(struct pm4_mes_map_process));
+@@ -86,10 +84,7 @@ static int pm_map_process_vi(struct packet_manager *pm,
+ packet->bitfields10.gds_size = qpd->gds_size;
+ packet->bitfields10.num_gws = qpd->num_gws;
+ packet->bitfields10.num_oac = qpd->num_oac;
+- num_queues = 0;
+- list_for_each_entry(cur, &qpd->queues_list, list)
+- num_queues++;
+- packet->bitfields10.num_queues = (qpd->is_debug) ? 0 : num_queues;
++ packet->bitfields10.num_queues = (qpd->is_debug) ? 0 : qpd->queue_count;
+
+ packet->sh_mem_config = qpd->sh_mem_config;
+ packet->sh_mem_bases = qpd->sh_mem_bases;
+diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
+index 4d17b29..b674e6d 100644
+--- a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
++++ b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
+@@ -527,7 +527,6 @@ struct scheduling_resources {
+ struct process_queue_manager {
+ /* data */
+ struct kfd_process *process;
+- unsigned int num_concurrent_processes;
+ struct list_head queues;
+ unsigned long *queue_slot_bitmap;
+ };
+diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c b/drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c
+index 543a3fc..c96d59a 100644
+--- a/drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c
++++ b/drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c
+@@ -147,8 +147,6 @@ int pqm_create_queue(struct process_queue_manager *pqm,
+ struct queue *q;
+ struct process_queue_node *pqn;
+ struct kernel_queue *kq;
+- int num_queues = 0;
+- struct queue *cur;
+ enum kfd_queue_type type = properties->type;
+
+ q = NULL;
+@@ -166,11 +164,8 @@ int pqm_create_queue(struct process_queue_manager *pqm,
+ * If we are just about to create DIQ, the is_debug flag is not set yet
+ * Hence we also check the type as well
+ */
+- if ((pdd->qpd.is_debug) ||
+- (type == KFD_QUEUE_TYPE_DIQ)) {
+- list_for_each_entry(cur, &pdd->qpd.queues_list, list)
+- num_queues++;
+- if (num_queues >= dev->device_info->max_no_of_hqd/2)
++ if ((pdd->qpd.is_debug) || (type == KFD_QUEUE_TYPE_DIQ)) {
++ if (pdd->qpd.queue_count >= dev->device_info->max_no_of_hqd/2)
+ return -ENOSPC;
+ }
+
+--
+2.7.4
+
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-04-16 16:07:51 +0000