Skip to contentSkip to conversation

drm/amdkfd: Make queue mapping interfaces more consistent

PATCH In review Felix Kuehling 2 participants 5 messages Oct 18, 2017 – Oct 19, 2017 4 messages not in the archive

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/amdkfd: Make queue mapping interfaces more consistent

Pass unmap filter parameters directly to execute_queues_cpsch, same as unmap_queues_cpsch.

---
 .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c  | 32 +++++++++++-----------
 1 file changed, 16 insertions(+), 16 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +16 -16
index 933adb5..da3b743 100644
@@ -45,7 +45,8 @@ static int create_compute_queue_nocpsch(struct device_queue_manager *dqm,
 					struct qcm_process_device *qpd);
 
 static int execute_queues_cpsch(struct device_queue_manager *dqm,
-				bool static_queues_included);
+				enum kfd_unmap_queues_filter filter,
+				uint32_t filter_param);
 static int unmap_queues_cpsch(struct device_queue_manager *dqm,
 				enum kfd_unmap_queues_filter filter,
 				uint32_t filter_param);
@@ -741,7 +742,7 @@ static int start_cpsch(struct device_queue_manager *dqm)
 	init_interrupts(dqm);
 
 	mutex_lock(&dqm->lock);
-	execute_queues_cpsch(dqm, false);
+	execute_queues_cpsch(dqm, KFD_UNMAP_QUEUES_FILTER_DYNAMIC_QUEUES, 0);
 	mutex_unlock(&dqm->lock);
 
 	return 0;
@@ -787,7 +788,7 @@ static int create_kernel_queue_cpsch(struct device_queue_manager *dqm,
 	list_add(&kq->list, &qpd->priv_queue_list);
 	dqm->queue_count++;
 	qpd->is_debug = true;
-	execute_queues_cpsch(dqm, false);
+	execute_queues_cpsch(dqm, KFD_UNMAP_QUEUES_FILTER_DYNAMIC_QUEUES, 0);
 	mutex_unlock(&dqm->lock);
 
 	return 0;
@@ -801,7 +802,7 @@ static void destroy_kernel_queue_cpsch(struct device_queue_manager *dqm,
 	list_del(&kq->list);
 	dqm->queue_count--;
 	qpd->is_debug = false;
-	execute_queues_cpsch(dqm, true);
+	execute_queues_cpsch(dqm, KFD_UNMAP_QUEUES_FILTER_ALL_QUEUES, 0);
 	/*
 	 * Unconditionally decrement this counter, regardless of the queue's
 	 * type.
@@ -859,7 +860,8 @@ static int create_queue_cpsch(struct device_queue_manager *dqm, struct queue *q,
 	qpd->queue_count++;
 	if (q->properties.is_active) {
 		dqm->queue_count++;
-		retval = execute_queues_cpsch(dqm, false);
+		retval = execute_queues_cpsch(dqm,
+				KFD_UNMAP_QUEUES_FILTER_DYNAMIC_QUEUES, 0);
 	}
 
 	if (q->properties.type == KFD_QUEUE_TYPE_SDMA)
@@ -964,16 +966,12 @@ static int unmap_queues_cpsch(struct device_queue_manager *dqm,
 
 /* dqm->lock mutex has to be locked before calling this function */
 static int execute_queues_cpsch(struct device_queue_manager *dqm,
-				bool static_queues_included)
+				enum kfd_unmap_queues_filter filter,
+				uint32_t filter_param)
 {
 	int retval;
-	enum kfd_unmap_queues_filter filter;
-
-	filter = static_queues_included ?
-			KFD_UNMAP_QUEUES_FILTER_ALL_QUEUES :
-			KFD_UNMAP_QUEUES_FILTER_DYNAMIC_QUEUES;
 
-	retval = unmap_queues_cpsch(dqm, filter, 0);
+	retval = unmap_queues_cpsch(dqm, filter, filter_param);
 	if (retval) {
 		pr_err("The cp might be in an unrecoverable state due to an unsuccessful queues preemption\n");
 		return retval;
@@ -1024,7 +1022,8 @@ static int destroy_queue_cpsch(struct device_queue_manager *dqm,
 	if (q->properties.is_active)
 		dqm->queue_count--;
 
-	retval = execute_queues_cpsch(dqm, false);
+	retval = execute_queues_cpsch(dqm,
+				KFD_UNMAP_QUEUES_FILTER_DYNAMIC_QUEUES, 0);
 	if (retval == -ETIME)
 		qpd->reset_wavefronts = true;
 
@@ -1157,7 +1156,8 @@ static int process_termination_cpsch(struct device_queue_manager *dqm,
 	struct kernel_queue *kq, *kq_next;
 	struct mqd_manager *mqd;
 	struct device_process_node *cur, *next_dpn;
-	bool unmap_static_queues = false;
+	enum kfd_unmap_queues_filter filter =
+		KFD_UNMAP_QUEUES_FILTER_DYNAMIC_QUEUES;
 
 	retval = 0;
 
@@ -1169,7 +1169,7 @@ static int process_termination_cpsch(struct device_queue_manager *dqm,
 		dqm->queue_count--;
 		qpd->is_debug = false;
 		dqm->total_queue_count--;
-		unmap_static_queues = true;
+		filter = KFD_UNMAP_QUEUES_FILTER_ALL_QUEUES;
 	}
 
 	/* Clear all user mode queues */
@@ -1193,7 +1193,7 @@ static int process_termination_cpsch(struct device_queue_manager *dqm,
 		}
 	}
 
-	retval = execute_queues_cpsch(dqm, unmap_static_queues);
+	retval = execute_queues_cpsch(dqm, filter, 0);
 	if (retval || qpd->reset_wavefronts) {
 		pr_warn("Resetting wave fronts (cpsch) on dev %p\n", dqm->dev);
 		dbgdev_wave_reset_wavefronts(dqm->dev, qpd->pqm->process);
Signature · 6 lines
2.7.4

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): 1508295313-9552-1-git-send-email-Felix.Kuehling-5C7GfCeVMHo@public.gmane.org

#2 lore raw
Quoted 118 lines · Felix Kuehling

Pass unmap filter parameters directly to execute_queues_cpsch, same as unmap_queues_cpsch.

---
 .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c  | 32 +++++++++++-----------
 1 file changed, 16 insertions(+), 16 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +16 -17
index 933adb5..da3b743 100644
@@ -45,7 +45,8 @@ static int create_compute_queue_nocpsch(struct device_queue_manager *dqm,
                                        struct qcm_process_device *qpd);
 
 static int execute_queues_cpsch(struct device_queue_manager *dqm,
-                               bool static_queues_included);
+                               enum kfd_unmap_queues_filter filter,
+                               uint32_t filter_param);
 static int unmap_queues_cpsch(struct device_queue_manager *dqm,
                                enum kfd_unmap_queues_filter filter,
                                uint32_t filter_param);
@@ -741,7 +742,7 @@ static int start_cpsch(struct device_queue_manager *dqm)
        init_interrupts(dqm);
 
        mutex_lock(&dqm->lock);
-       execute_queues_cpsch(dqm, false);
+       execute_queues_cpsch(dqm, KFD_UNMAP_QUEUES_FILTER_DYNAMIC_QUEUES, 0);
        mutex_unlock(&dqm->lock);
 
        return 0;
@@ -787,7 +788,7 @@ static int create_kernel_queue_cpsch(struct device_queue_manager *dqm,
        list_add(&kq->list, &qpd->priv_queue_list);
        dqm->queue_count++;
        qpd->is_debug = true;
-       execute_queues_cpsch(dqm, false);
+       execute_queues_cpsch(dqm, KFD_UNMAP_QUEUES_FILTER_DYNAMIC_QUEUES, 0);
        mutex_unlock(&dqm->lock);
 
        return 0;
@@ -801,7 +802,7 @@ static void destroy_kernel_queue_cpsch(struct device_queue_manager *dqm,
        list_del(&kq->list);
        dqm->queue_count--;
        qpd->is_debug = false;
-       execute_queues_cpsch(dqm, true);
+       execute_queues_cpsch(dqm, KFD_UNMAP_QUEUES_FILTER_ALL_QUEUES, 0);
        /*
         * Unconditionally decrement this counter, regardless of the queue's
         * type.
@@ -859,7 +860,8 @@ static int create_queue_cpsch(struct device_queue_manager *dqm, struct queue *q,
        qpd->queue_count++;
        if (q->properties.is_active) {
                dqm->queue_count++;
-               retval = execute_queues_cpsch(dqm, false);
+               retval = execute_queues_cpsch(dqm,
+                               KFD_UNMAP_QUEUES_FILTER_DYNAMIC_QUEUES, 0);
        }
 
        if (q->properties.type == KFD_QUEUE_TYPE_SDMA)
@@ -964,16 +966,12 @@ static int unmap_queues_cpsch(struct device_queue_manager *dqm,
 
 /* dqm->lock mutex has to be locked before calling this function */
 static int execute_queues_cpsch(struct device_queue_manager *dqm,
-                               bool static_queues_included)
+                               enum kfd_unmap_queues_filter filter,
+                               uint32_t filter_param)
 {
        int retval;
-       enum kfd_unmap_queues_filter filter;
-
-       filter = static_queues_included ?
-                       KFD_UNMAP_QUEUES_FILTER_ALL_QUEUES :
-                       KFD_UNMAP_QUEUES_FILTER_DYNAMIC_QUEUES;
 
-       retval = unmap_queues_cpsch(dqm, filter, 0);
+       retval = unmap_queues_cpsch(dqm, filter, filter_param);
        if (retval) {
                pr_err("The cp might be in an unrecoverable state due to an unsuccessful queues preemption\n");
                return retval;
@@ -1024,7 +1022,8 @@ static int destroy_queue_cpsch(struct device_queue_manager *dqm,
        if (q->properties.is_active)
                dqm->queue_count--;
 
-       retval = execute_queues_cpsch(dqm, false);
+       retval = execute_queues_cpsch(dqm,
+                               KFD_UNMAP_QUEUES_FILTER_DYNAMIC_QUEUES, 0);
        if (retval == -ETIME)
                qpd->reset_wavefronts = true;
 
@@ -1157,7 +1156,8 @@ static int process_termination_cpsch(struct device_queue_manager *dqm,
        struct kernel_queue *kq, *kq_next;
        struct mqd_manager *mqd;
        struct device_process_node *cur, *next_dpn;
-       bool unmap_static_queues = false;
+       enum kfd_unmap_queues_filter filter =
+               KFD_UNMAP_QUEUES_FILTER_DYNAMIC_QUEUES;
 
        retval = 0;
 
@@ -1169,7 +1169,7 @@ static int process_termination_cpsch(struct device_queue_manager *dqm,
                dqm->queue_count--;
                qpd->is_debug = false;
                dqm->total_queue_count--;
-               unmap_static_queues = true;
+               filter = KFD_UNMAP_QUEUES_FILTER_ALL_QUEUES;
        }
 
        /* Clear all user mode queues */
@@ -1193,7 +1193,7 @@ static int process_termination_cpsch(struct device_queue_manager *dqm,
                }
        }
 
-       retval = execute_queues_cpsch(dqm, unmap_static_queues);
+       retval = execute_queues_cpsch(dqm, filter, 0);
        if (retval || qpd->reset_wavefronts) {
                pr_warn("Resetting wave fronts (cpsch) on dev %p\n", dqm->dev);
                dbgdev_wave_reset_wavefronts(dqm->dev, qpd->pqm->process);
--
Quoted 2 lines

2.7.4

Thanks Felix.
I'll add it to the next tree instead of the one from the patch-set.

Oded
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): CAFCwf13j-5RSsXyyuF3kVzuP6+a2swBuh0R5X3+JTaVDoMLztA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org

#4 lore raw
Quoted 4 lines

Thanks Felix.
I'll add it to the next tree instead of the one from the patch-set.

Oded

I based this patch on your current amdkfd-next. Do you have another "next tree"?

Regards,
Felix

-----Original Message-----
From: Oded Gabbay [mailto:[email protected]]
Sent: Wednesday, October 18, 2017 12:36 AM
To: Kuehling, Felix
Cc: amd-gfx list
Subject: Re: [PATCH] drm/amdkfd: Make queue mapping interfaces more consistent

Quoted 126 lines · Felix Kuehling

Pass unmap filter parameters directly to execute_queues_cpsch, same as unmap_queues_cpsch.

---
 .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c  | 32 
+++++++++++-----------
 1 file changed, 16 insertions(+), 16 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +2 -1
index 933adb5..da3b743 100644
@@ -45,7 +45,8 @@ static int create_compute_queue_nocpsch(struct device_queue_manager *dqm,
                                        struct qcm_process_device 
 *qpd);
 
 static int execute_queues_cpsch(struct device_queue_manager *dqm,
-                               bool static_queues_included);
+                               enum kfd_unmap_queues_filter filter,
+                               uint32_t filter_param);
 static int unmap_queues_cpsch(struct device_queue_manager *dqm,
                                enum kfd_unmap_queues_filter filter,
                                uint32_t filter_param); @@ -741,7 
+742,7 @@ static int start_cpsch(struct device_queue_manager *dqm)
        init_interrupts(dqm);

        mutex_lock(&dqm->lock);
drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +10 -4
-       execute_queues_cpsch(dqm, false);
+       execute_queues_cpsch(dqm, 
+ KFD_UNMAP_QUEUES_FILTER_DYNAMIC_QUEUES, 0);
        mutex_unlock(&dqm->lock);
 
        return 0;
@@ -787,7 +788,7 @@ static int create_kernel_queue_cpsch(struct device_queue_manager *dqm,
        list_add(&kq->list, &qpd->priv_queue_list);
        dqm->queue_count++;
        qpd->is_debug = true;
-       execute_queues_cpsch(dqm, false);
+       execute_queues_cpsch(dqm, 
+ KFD_UNMAP_QUEUES_FILTER_DYNAMIC_QUEUES, 0);
        mutex_unlock(&dqm->lock);
 
        return 0;
@@ -801,7 +802,7 @@ static void destroy_kernel_queue_cpsch(struct device_queue_manager *dqm,
        list_del(&kq->list);
        dqm->queue_count--;
        qpd->is_debug = false;
-       execute_queues_cpsch(dqm, true);
+       execute_queues_cpsch(dqm, KFD_UNMAP_QUEUES_FILTER_ALL_QUEUES, 
+ 0);
        /*
         * Unconditionally decrement this counter, regardless of the queue's
         * type.
@@ -859,7 +860,8 @@ static int create_queue_cpsch(struct device_queue_manager *dqm, struct queue *q,
        qpd->queue_count++;
        if (q->properties.is_active) {
                dqm->queue_count++;
-               retval = execute_queues_cpsch(dqm, false);
+               retval = execute_queues_cpsch(dqm,
+                               
+ KFD_UNMAP_QUEUES_FILTER_DYNAMIC_QUEUES, 0);
        }
 
        if (q->properties.type == KFD_QUEUE_TYPE_SDMA) @@ -964,16 
+966,12 @@ static int unmap_queues_cpsch(struct device_queue_manager 

*dqm,

/* dqm->lock mutex has to be locked before calling this function */
static int execute_queues_cpsch(struct device_queue_manager *dqm,

drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +9 -10
-                               bool static_queues_included)
+                               enum kfd_unmap_queues_filter filter,
+                               uint32_t filter_param)
 {
        int retval;
-       enum kfd_unmap_queues_filter filter;
-
-       filter = static_queues_included ?
-                       KFD_UNMAP_QUEUES_FILTER_ALL_QUEUES :
-                       KFD_UNMAP_QUEUES_FILTER_DYNAMIC_QUEUES;
 
-       retval = unmap_queues_cpsch(dqm, filter, 0);
+       retval = unmap_queues_cpsch(dqm, filter, filter_param);
        if (retval) {
                pr_err("The cp might be in an unrecoverable state due to an unsuccessful queues preemption\n");
                return retval;
@@ -1024,7 +1022,8 @@ static int destroy_queue_cpsch(struct device_queue_manager *dqm,
        if (q->properties.is_active)
                dqm->queue_count--;
 
-       retval = execute_queues_cpsch(dqm, false);
+       retval = execute_queues_cpsch(dqm,
+                               
+ KFD_UNMAP_QUEUES_FILTER_DYNAMIC_QUEUES, 0);
        if (retval == -ETIME)
                qpd->reset_wavefronts = true;
@@ -1157,7 +1156,8 @@ static int process_termination_cpsch(struct device_queue_manager *dqm,
        struct kernel_queue *kq, *kq_next;
        struct mqd_manager *mqd;
        struct device_process_node *cur, *next_dpn;
-       bool unmap_static_queues = false;
+       enum kfd_unmap_queues_filter filter =
+               KFD_UNMAP_QUEUES_FILTER_DYNAMIC_QUEUES;
 
        retval = 0;
 
@@ -1169,7 +1169,7 @@ static int process_termination_cpsch(struct device_queue_manager *dqm,
                dqm->queue_count--;
                qpd->is_debug = false;
                dqm->total_queue_count--;
-               unmap_static_queues = true;
+               filter = KFD_UNMAP_QUEUES_FILTER_ALL_QUEUES;
        }
 
        /* Clear all user mode queues */ @@ -1193,7 +1193,7 @@ static 

int process_termination_cpsch(struct device_queue_manager *dqm,

                }
        }
drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +1 -1
-       retval = execute_queues_cpsch(dqm, unmap_static_queues);
+       retval = execute_queues_cpsch(dqm, filter, 0);
        if (retval || qpd->reset_wavefronts) {
                pr_warn("Resetting wave fronts (cpsch) on dev %p\n", dqm->dev);
                dbgdev_wave_reset_wavefronts(dqm->dev, 
Quoted 4 lines

qpd->pqm->process);
--
2.7.4

Thanks Felix.
I'll add it to the next tree instead of the one from the patch-set.

Oded
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): DM5PR1201MB023552B3C47BED443A798837924D0-grEf7a3NxMBd8L2jMOIKKmrFom/aUZj6nBOFsp37pqbUKgpGm//BTAC/[email protected]

#6 lore raw
Quoted 6 lines · Felix
Quoted 4 lines

Thanks Felix.
I'll add it to the next tree instead of the one from the patch-set.

Oded

I based this patch on your current amdkfd-next. Do you have another "next tree"?

No, that's fine.
I simply squashed this patch with the original patch because its kind of redundant to have two patches in the same time that change the function's API to two different formats.

Oded

Quoted 146 lines

Regards,
Felix

-----Original Message-----
From: Oded Gabbay [mailto:[email protected]]
Sent: Wednesday, October 18, 2017 12:36 AM
To: Kuehling, Felix
Cc: amd-gfx list
Subject: Re: [PATCH] drm/amdkfd: Make queue mapping interfaces more consistent

Quoted 126 lines · Felix Kuehling

Pass unmap filter parameters directly to execute_queues_cpsch, same as unmap_queues_cpsch.

---
 .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c  | 32
+++++++++++-----------
 1 file changed, 16 insertions(+), 16 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +2 -1
index 933adb5..da3b743 100644
@@ -45,7 +45,8 @@ static int create_compute_queue_nocpsch(struct device_queue_manager *dqm,
                                        struct qcm_process_device
 *qpd);
 
 static int execute_queues_cpsch(struct device_queue_manager *dqm,
-                               bool static_queues_included);
+                               enum kfd_unmap_queues_filter filter,
+                               uint32_t filter_param);
 static int unmap_queues_cpsch(struct device_queue_manager *dqm,
                                enum kfd_unmap_queues_filter filter,
                                uint32_t filter_param); @@ -741,7
+742,7 @@ static int start_cpsch(struct device_queue_manager *dqm)
        init_interrupts(dqm);

        mutex_lock(&dqm->lock);
drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +10 -4
-       execute_queues_cpsch(dqm, false);
+       execute_queues_cpsch(dqm,
+ KFD_UNMAP_QUEUES_FILTER_DYNAMIC_QUEUES, 0);
        mutex_unlock(&dqm->lock);
 
        return 0;
@@ -787,7 +788,7 @@ static int create_kernel_queue_cpsch(struct device_queue_manager *dqm,
        list_add(&kq->list, &qpd->priv_queue_list);
        dqm->queue_count++;
        qpd->is_debug = true;
-       execute_queues_cpsch(dqm, false);
+       execute_queues_cpsch(dqm,
+ KFD_UNMAP_QUEUES_FILTER_DYNAMIC_QUEUES, 0);
        mutex_unlock(&dqm->lock);
 
        return 0;
@@ -801,7 +802,7 @@ static void destroy_kernel_queue_cpsch(struct device_queue_manager *dqm,
        list_del(&kq->list);
        dqm->queue_count--;
        qpd->is_debug = false;
-       execute_queues_cpsch(dqm, true);
+       execute_queues_cpsch(dqm, KFD_UNMAP_QUEUES_FILTER_ALL_QUEUES,
+ 0);
        /*
         * Unconditionally decrement this counter, regardless of the queue's
         * type.
@@ -859,7 +860,8 @@ static int create_queue_cpsch(struct device_queue_manager *dqm, struct queue *q,
        qpd->queue_count++;
        if (q->properties.is_active) {
                dqm->queue_count++;
-               retval = execute_queues_cpsch(dqm, false);
+               retval = execute_queues_cpsch(dqm,
+
+ KFD_UNMAP_QUEUES_FILTER_DYNAMIC_QUEUES, 0);
        }
 
        if (q->properties.type == KFD_QUEUE_TYPE_SDMA) @@ -964,16
+966,12 @@ static int unmap_queues_cpsch(struct device_queue_manager

*dqm,

/* dqm->lock mutex has to be locked before calling this function */
static int execute_queues_cpsch(struct device_queue_manager *dqm,

drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +9 -10
-                               bool static_queues_included)
+                               enum kfd_unmap_queues_filter filter,
+                               uint32_t filter_param)
 {
        int retval;
-       enum kfd_unmap_queues_filter filter;
-
-       filter = static_queues_included ?
-                       KFD_UNMAP_QUEUES_FILTER_ALL_QUEUES :
-                       KFD_UNMAP_QUEUES_FILTER_DYNAMIC_QUEUES;
 
-       retval = unmap_queues_cpsch(dqm, filter, 0);
+       retval = unmap_queues_cpsch(dqm, filter, filter_param);
        if (retval) {
                pr_err("The cp might be in an unrecoverable state due to an unsuccessful queues preemption\n");
                return retval;
@@ -1024,7 +1022,8 @@ static int destroy_queue_cpsch(struct device_queue_manager *dqm,
        if (q->properties.is_active)
                dqm->queue_count--;
 
-       retval = execute_queues_cpsch(dqm, false);
+       retval = execute_queues_cpsch(dqm,
+
+ KFD_UNMAP_QUEUES_FILTER_DYNAMIC_QUEUES, 0);
        if (retval == -ETIME)
                qpd->reset_wavefronts = true;
@@ -1157,7 +1156,8 @@ static int process_termination_cpsch(struct device_queue_manager *dqm,
        struct kernel_queue *kq, *kq_next;
        struct mqd_manager *mqd;
        struct device_process_node *cur, *next_dpn;
-       bool unmap_static_queues = false;
+       enum kfd_unmap_queues_filter filter =
+               KFD_UNMAP_QUEUES_FILTER_DYNAMIC_QUEUES;
 
        retval = 0;
 
@@ -1169,7 +1169,7 @@ static int process_termination_cpsch(struct device_queue_manager *dqm,
                dqm->queue_count--;
                qpd->is_debug = false;
                dqm->total_queue_count--;
-               unmap_static_queues = true;
+               filter = KFD_UNMAP_QUEUES_FILTER_ALL_QUEUES;
        }
 
        /* Clear all user mode queues */ @@ -1193,7 +1193,7 @@ static

int process_termination_cpsch(struct device_queue_manager *dqm,

                }
        }
drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +1 -1
-       retval = execute_queues_cpsch(dqm, unmap_static_queues);
+       retval = execute_queues_cpsch(dqm, filter, 0);
        if (retval || qpd->reset_wavefronts) {
                pr_warn("Resetting wave fronts (cpsch) on dev %p\n", dqm->dev);
                dbgdev_wave_reset_wavefronts(dqm->dev,
Quoted 4 lines

qpd->pqm->process);
--
2.7.4

Thanks Felix.
I'll add it to the next tree instead of the one from the patch-set.

Quoted 1 line

Oded

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): CAFCwf11pge+Z46L0AXKqmQvv8F6BUmuim4VbJELwZ1vdBk9TCA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org

#8 lore raw
Quoted 10 lines · Oded Gabbay
Quoted 5 lines · Felix
Quoted 4 lines

Thanks Felix.
I'll add it to the next tree instead of the one from the patch-set.

Oded

I based this patch on your current amdkfd-next. Do you have another "next tree"?

No, that's fine.
I simply squashed this patch with the original patch because its kind of redundant to have two patches in the same time that change the function's API to two different formats.

I see, that makes sense.

Thanks,
  Felix

Quoted 148 lines

Oded

Quoted 145 lines

Regards,
Felix

-----Original Message-----
From: Oded Gabbay [mailto:[email protected]]
Sent: Wednesday, October 18, 2017 12:36 AM
To: Kuehling, Felix
Cc: amd-gfx list
Subject: Re: [PATCH] drm/amdkfd: Make queue mapping interfaces more consistent

Quoted 126 lines · Felix Kuehling

Pass unmap filter parameters directly to execute_queues_cpsch, same as unmap_queues_cpsch.

---
 .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c  | 32
+++++++++++-----------
 1 file changed, 16 insertions(+), 16 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +2 -1
index 933adb5..da3b743 100644
@@ -45,7 +45,8 @@ static int create_compute_queue_nocpsch(struct device_queue_manager *dqm,
                                        struct qcm_process_device
 *qpd);
 
 static int execute_queues_cpsch(struct device_queue_manager *dqm,
-                               bool static_queues_included);
+                               enum kfd_unmap_queues_filter filter,
+                               uint32_t filter_param);
 static int unmap_queues_cpsch(struct device_queue_manager *dqm,
                                enum kfd_unmap_queues_filter filter,
                                uint32_t filter_param); @@ -741,7
+742,7 @@ static int start_cpsch(struct device_queue_manager *dqm)
        init_interrupts(dqm);

        mutex_lock(&dqm->lock);
drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +10 -4
-       execute_queues_cpsch(dqm, false);
+       execute_queues_cpsch(dqm,
+ KFD_UNMAP_QUEUES_FILTER_DYNAMIC_QUEUES, 0);
        mutex_unlock(&dqm->lock);
 
        return 0;
@@ -787,7 +788,7 @@ static int create_kernel_queue_cpsch(struct device_queue_manager *dqm,
        list_add(&kq->list, &qpd->priv_queue_list);
        dqm->queue_count++;
        qpd->is_debug = true;
-       execute_queues_cpsch(dqm, false);
+       execute_queues_cpsch(dqm,
+ KFD_UNMAP_QUEUES_FILTER_DYNAMIC_QUEUES, 0);
        mutex_unlock(&dqm->lock);
 
        return 0;
@@ -801,7 +802,7 @@ static void destroy_kernel_queue_cpsch(struct device_queue_manager *dqm,
        list_del(&kq->list);
        dqm->queue_count--;
        qpd->is_debug = false;
-       execute_queues_cpsch(dqm, true);
+       execute_queues_cpsch(dqm, KFD_UNMAP_QUEUES_FILTER_ALL_QUEUES,
+ 0);
        /*
         * Unconditionally decrement this counter, regardless of the queue's
         * type.
@@ -859,7 +860,8 @@ static int create_queue_cpsch(struct device_queue_manager *dqm, struct queue *q,
        qpd->queue_count++;
        if (q->properties.is_active) {
                dqm->queue_count++;
-               retval = execute_queues_cpsch(dqm, false);
+               retval = execute_queues_cpsch(dqm,
+
+ KFD_UNMAP_QUEUES_FILTER_DYNAMIC_QUEUES, 0);
        }
 
        if (q->properties.type == KFD_QUEUE_TYPE_SDMA) @@ -964,16
+966,12 @@ static int unmap_queues_cpsch(struct device_queue_manager

*dqm,

/* dqm->lock mutex has to be locked before calling this function */
static int execute_queues_cpsch(struct device_queue_manager *dqm,

drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +9 -10
-                               bool static_queues_included)
+                               enum kfd_unmap_queues_filter filter,
+                               uint32_t filter_param)
 {
        int retval;
-       enum kfd_unmap_queues_filter filter;
-
-       filter = static_queues_included ?
-                       KFD_UNMAP_QUEUES_FILTER_ALL_QUEUES :
-                       KFD_UNMAP_QUEUES_FILTER_DYNAMIC_QUEUES;
 
-       retval = unmap_queues_cpsch(dqm, filter, 0);
+       retval = unmap_queues_cpsch(dqm, filter, filter_param);
        if (retval) {
                pr_err("The cp might be in an unrecoverable state due to an unsuccessful queues preemption\n");
                return retval;
@@ -1024,7 +1022,8 @@ static int destroy_queue_cpsch(struct device_queue_manager *dqm,
        if (q->properties.is_active)
                dqm->queue_count--;
 
-       retval = execute_queues_cpsch(dqm, false);
+       retval = execute_queues_cpsch(dqm,
+
+ KFD_UNMAP_QUEUES_FILTER_DYNAMIC_QUEUES, 0);
        if (retval == -ETIME)
                qpd->reset_wavefronts = true;
@@ -1157,7 +1156,8 @@ static int process_termination_cpsch(struct device_queue_manager *dqm,
        struct kernel_queue *kq, *kq_next;
        struct mqd_manager *mqd;
        struct device_process_node *cur, *next_dpn;
-       bool unmap_static_queues = false;
+       enum kfd_unmap_queues_filter filter =
+               KFD_UNMAP_QUEUES_FILTER_DYNAMIC_QUEUES;
 
        retval = 0;
 
@@ -1169,7 +1169,7 @@ static int process_termination_cpsch(struct device_queue_manager *dqm,
                dqm->queue_count--;
                qpd->is_debug = false;
                dqm->total_queue_count--;
-               unmap_static_queues = true;
+               filter = KFD_UNMAP_QUEUES_FILTER_ALL_QUEUES;
        }
 
        /* Clear all user mode queues */ @@ -1193,7 +1193,7 @@ static

int process_termination_cpsch(struct device_queue_manager *dqm,

                }
        }
drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +1 -1
-       retval = execute_queues_cpsch(dqm, unmap_static_queues);
+       retval = execute_queues_cpsch(dqm, filter, 0);
        if (retval || qpd->reset_wavefronts) {
                pr_warn("Resetting wave fronts (cpsch) on dev %p\n", dqm->dev);
                dbgdev_wave_reset_wavefronts(dqm->dev,
Quoted 4 lines

qpd->pqm->process);
--
2.7.4

Thanks Felix.
I'll add it to the next tree instead of the one from the patch-set.

Oded

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx