Commit 323c71df authored by Oak Zeng's avatar Oak Zeng Committed by Alex Deucher
Browse files

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: default avatarOak Zeng <ozeng@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 96eb5f9d

drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c

+5 −5
Original line number Diff line number Diff line
@@ -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,