Commit cb77ee7c authored by Oak Zeng's avatar Oak Zeng Committed by Alex Deucher

drm/amdkfd: Use 64 bit sdma_bitmap

Maximumly support 64 sdma queues
Signed-off-by: default avatarOak Zeng <Oak.Zeng@amd.com>
Reviewed-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent bcae18c2
...@@ -891,7 +891,7 @@ static int initialize_nocpsch(struct device_queue_manager *dqm) ...@@ -891,7 +891,7 @@ static int initialize_nocpsch(struct device_queue_manager *dqm)
} }
dqm->vmid_bitmap = (1 << dqm->dev->vm_info.vmid_num_kfd) - 1; dqm->vmid_bitmap = (1 << dqm->dev->vm_info.vmid_num_kfd) - 1;
dqm->sdma_bitmap = (1 << get_num_sdma_queues(dqm)) - 1; dqm->sdma_bitmap = (1ULL << get_num_sdma_queues(dqm)) - 1;
return 0; return 0;
} }
...@@ -929,8 +929,8 @@ static int allocate_sdma_queue(struct device_queue_manager *dqm, ...@@ -929,8 +929,8 @@ static int allocate_sdma_queue(struct device_queue_manager *dqm,
if (dqm->sdma_bitmap == 0) if (dqm->sdma_bitmap == 0)
return -ENOMEM; return -ENOMEM;
bit = ffs(dqm->sdma_bitmap) - 1; bit = __ffs64(dqm->sdma_bitmap);
dqm->sdma_bitmap &= ~(1 << bit); dqm->sdma_bitmap &= ~(1ULL << bit);
*sdma_queue_id = bit; *sdma_queue_id = bit;
return 0; return 0;
...@@ -941,7 +941,7 @@ static void deallocate_sdma_queue(struct device_queue_manager *dqm, ...@@ -941,7 +941,7 @@ static void deallocate_sdma_queue(struct device_queue_manager *dqm,
{ {
if (sdma_queue_id >= get_num_sdma_queues(dqm)) if (sdma_queue_id >= get_num_sdma_queues(dqm))
return; return;
dqm->sdma_bitmap |= (1 << sdma_queue_id); dqm->sdma_bitmap |= (1ULL << sdma_queue_id);
} }
static int create_sdma_queue_nocpsch(struct device_queue_manager *dqm, static int create_sdma_queue_nocpsch(struct device_queue_manager *dqm,
...@@ -1047,7 +1047,7 @@ static int initialize_cpsch(struct device_queue_manager *dqm) ...@@ -1047,7 +1047,7 @@ static int initialize_cpsch(struct device_queue_manager *dqm)
dqm->queue_count = dqm->processes_count = 0; dqm->queue_count = dqm->processes_count = 0;
dqm->sdma_queue_count = 0; dqm->sdma_queue_count = 0;
dqm->active_runlist = false; dqm->active_runlist = false;
dqm->sdma_bitmap = (1 << get_num_sdma_queues(dqm)) - 1; dqm->sdma_bitmap = (1ULL << get_num_sdma_queues(dqm)) - 1;
INIT_WORK(&dqm->hw_exception_work, kfd_process_hw_exception); INIT_WORK(&dqm->hw_exception_work, kfd_process_hw_exception);
......
...@@ -188,7 +188,7 @@ struct device_queue_manager { ...@@ -188,7 +188,7 @@ struct device_queue_manager {
unsigned int total_queue_count; unsigned int total_queue_count;
unsigned int next_pipe_to_allocate; unsigned int next_pipe_to_allocate;
unsigned int *allocated_queues; unsigned int *allocated_queues;
unsigned int sdma_bitmap; uint64_t sdma_bitmap;
unsigned int vmid_bitmap; unsigned int vmid_bitmap;
uint64_t pipelines_addr; uint64_t pipelines_addr;
struct kfd_mem_obj *pipeline_mem; struct kfd_mem_obj *pipeline_mem;
......
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