summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOak Zeng <ozeng@amd.com>2018-12-03 09:20:20 -0600
committerAlex Deucher <alexander.deucher@amd.com>2019-05-24 12:21:01 -0500
commit323c71df9447f277dd151b65711bc9ba51fcc4c0 (patch)
tree3efd1188a427872244eb4040bbe53b8903583903
parent96eb5f9dd3d85f3204b271b208b36dfe4df14101 (diff)
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 <ozeng@amd.com> Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com> Signed-off-by: Felix Kuehling <Felix.Kuehling@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r--drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c10
1 files 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,