Commit b9dd6fbd authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Alex Deucher

drm/amdkfd: Use bitmap_zalloc() when applicable

'doorbell_bitmap' and 'queue_slot_bitmap' are bitmaps. So use
'bitmap_zalloc()' to simplify code, improve the semantic and avoid some
open-coded arithmetic in allocator arguments.

Also change the corresponding 'kfree()' into 'bitmap_free()' to keep
consistency.
Reviewed-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent b7e7e6ca
...@@ -1011,7 +1011,7 @@ static void kfd_process_destroy_pdds(struct kfd_process *p) ...@@ -1011,7 +1011,7 @@ static void kfd_process_destroy_pdds(struct kfd_process *p)
free_pages((unsigned long)pdd->qpd.cwsr_kaddr, free_pages((unsigned long)pdd->qpd.cwsr_kaddr,
get_order(KFD_CWSR_TBA_TMA_SIZE)); get_order(KFD_CWSR_TBA_TMA_SIZE));
kfree(pdd->qpd.doorbell_bitmap); bitmap_free(pdd->qpd.doorbell_bitmap);
idr_destroy(&pdd->alloc_idr); idr_destroy(&pdd->alloc_idr);
kfd_free_process_doorbells(pdd->dev, pdd->doorbell_index); kfd_free_process_doorbells(pdd->dev, pdd->doorbell_index);
...@@ -1433,9 +1433,8 @@ static int init_doorbell_bitmap(struct qcm_process_device *qpd, ...@@ -1433,9 +1433,8 @@ static int init_doorbell_bitmap(struct qcm_process_device *qpd,
if (!KFD_IS_SOC15(dev)) if (!KFD_IS_SOC15(dev))
return 0; return 0;
qpd->doorbell_bitmap = qpd->doorbell_bitmap = bitmap_zalloc(KFD_MAX_NUM_OF_QUEUES_PER_PROCESS,
kzalloc(DIV_ROUND_UP(KFD_MAX_NUM_OF_QUEUES_PER_PROCESS, GFP_KERNEL);
BITS_PER_BYTE), GFP_KERNEL);
if (!qpd->doorbell_bitmap) if (!qpd->doorbell_bitmap)
return -ENOMEM; return -ENOMEM;
......
...@@ -135,9 +135,8 @@ void kfd_process_dequeue_from_all_devices(struct kfd_process *p) ...@@ -135,9 +135,8 @@ void kfd_process_dequeue_from_all_devices(struct kfd_process *p)
int pqm_init(struct process_queue_manager *pqm, struct kfd_process *p) int pqm_init(struct process_queue_manager *pqm, struct kfd_process *p)
{ {
INIT_LIST_HEAD(&pqm->queues); INIT_LIST_HEAD(&pqm->queues);
pqm->queue_slot_bitmap = pqm->queue_slot_bitmap = bitmap_zalloc(KFD_MAX_NUM_OF_QUEUES_PER_PROCESS,
kzalloc(DIV_ROUND_UP(KFD_MAX_NUM_OF_QUEUES_PER_PROCESS, GFP_KERNEL);
BITS_PER_BYTE), GFP_KERNEL);
if (!pqm->queue_slot_bitmap) if (!pqm->queue_slot_bitmap)
return -ENOMEM; return -ENOMEM;
pqm->process = p; pqm->process = p;
...@@ -159,7 +158,7 @@ void pqm_uninit(struct process_queue_manager *pqm) ...@@ -159,7 +158,7 @@ void pqm_uninit(struct process_queue_manager *pqm)
kfree(pqn); kfree(pqn);
} }
kfree(pqm->queue_slot_bitmap); bitmap_free(pqm->queue_slot_bitmap);
pqm->queue_slot_bitmap = NULL; pqm->queue_slot_bitmap = NULL;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment