drm/amdkfd: decrement queue count on mes queue destroy

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

Signed-off-by: Jonathan Kim <jonathan.kim@amd.com>
Reviewed-by: Felix Kuehling <felix.kuehling@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

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 8a39a9e..f515cb8 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
@@ -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);