drm/amdkfd: Handle case of invalid queue type

This patch handles a case where amdkfd tries to destroy a queue but the queue
type is invalid.
This case occurs in non-HWS path.

Signed-off-by: Oded Gabbay <oded.gabbay@amd.com>
Reviewed-by: Jammy Zhou <Jammy.Zhou@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 85387c8b296cad706ec26017469646309da78370..99e2dbbb4862b31955fda1e722a8c5640bd704d1 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
@@ -301,6 +301,11 @@ static int destroy_queue_nocpsch(struct device_queue_manager *dqm,
                }
                dqm->sdma_queue_count--;
                deallocate_sdma_queue(dqm, q->sdma_id);
+       } else {
+               pr_debug("q->properties.type is invalid (%d)\n",
+                               q->properties.type);
+               retval = -EINVAL;
+               goto out;
        }
 
        retval = mqd->destroy_mqd(mqd, q->mqd,