Skip to contentSkip to conversation

drm/amdkfd: decrement queue count on mes queue destroy

PATCH In review Jonathan Kim 2 participants 2 messages Jun 13, 2023

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

PATCH 1/1 drm/amdkfd: decrement queue count on mes queue destroy

Queue count should decrement on queue destruction regardless of HWS support type.

---
 drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +1 -1
index 8a39a9e0ed5a..f515cb8f30ca 100644
@@ -2089,8 +2089,8 @@ static int destroy_queue_cpsch(struct device_queue_manager *dqm,
 	list_del(&q->list);
 	qpd->queue_count--;
 	if (q->properties.is_active) {
+		decrement_queue_count(dqm, qpd, q);
 		if (!dqm->dev->kfd->shared_resources.enable_mes) {
-			decrement_queue_count(dqm, qpd, q);
 			retval = execute_queues_cpsch(dqm,
 						      KFD_UNMAP_QUEUES_FILTER_DYNAMIC_QUEUES, 0,
 						      USE_DEFAULT_GRACE_PERIOD);
Signature · 1 line
2.25.1
maintainer Reviewed-by on v1 1/1
#1 lore raw
Quoted 4 lines · Jonathan Kim

Queue count should decrement on queue destruction regardless of HWS support type.

Quoted 18 lines
---
  drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +1 -1
index 8a39a9e0ed5a..f515cb8f30ca 100644
@@ -2089,8 +2089,8 @@ static int destroy_queue_cpsch(struct device_queue_manager *dqm,
  	list_del(&q->list);
  	qpd->queue_count--;
  	if (q->properties.is_active) {
+		decrement_queue_count(dqm, qpd, q);
  		if (!dqm->dev->kfd->shared_resources.enable_mes) {
-			decrement_queue_count(dqm, qpd, q);
  			retval = execute_queues_cpsch(dqm,
  						      KFD_UNMAP_QUEUES_FILTER_DYNAMIC_QUEUES, 0,
  						      USE_DEFAULT_GRACE_PERIOD);