From 323c71df9447f277dd151b65711bc9ba51fcc4c0 Mon Sep 17 00:00:00 2001 From: Oak Zeng Date: Mon, 3 Dec 2018 09:20:20 -0600 Subject: [PATCH] drm/amdkfd: Differentiate b/t sdma_id and sdma_queue_id sdma_queue_id is sdma queue index inside one sdma engine. sdma_id is sdma queue index among all sdma engines. Use those two names properly. Signed-off-by: Oak Zeng Reviewed-by: Felix Kuehling Signed-off-by: Felix Kuehling Signed-off-by: Alex Deucher --- drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 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 775f20eb4f68..426d3a46f501 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c @@ -922,7 +922,7 @@ static int stop_nocpsch(struct device_queue_manager *dqm) } static int allocate_sdma_queue(struct device_queue_manager *dqm, - unsigned int *sdma_queue_id) + unsigned int *sdma_id) { int bit; @@ -931,17 +931,17 @@ static int allocate_sdma_queue(struct device_queue_manager *dqm, bit = __ffs64(dqm->sdma_bitmap); dqm->sdma_bitmap &= ~(1ULL << bit); - *sdma_queue_id = bit; + *sdma_id = bit; return 0; } static void deallocate_sdma_queue(struct device_queue_manager *dqm, - unsigned int sdma_queue_id) + unsigned int sdma_id) { - if (sdma_queue_id >= get_num_sdma_queues(dqm)) + if (sdma_id >= get_num_sdma_queues(dqm)) return; - dqm->sdma_bitmap |= (1ULL << sdma_queue_id); + dqm->sdma_bitmap |= (1ULL << sdma_id); } static int create_sdma_queue_nocpsch(struct device_queue_manager *dqm, -- 2.30.2