Commit 0c88b430 authored by Nirmoy Das's avatar Nirmoy Das Committed by Alex Deucher
Browse files

drm/amdgpu: replace vm_pte's run-queue list with drm gpu scheds list 



drm_sched_entity_init() takes drm gpu scheduler list instead of
drm_sched_rq list. This makes conversion of drm_sched_rq list
to drm gpu scheduler list unnecessary

Signed-off-by: default avatarNirmoy Das <nirmoy.das@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent b3ac1766

drivers/gpu/drm/amd/amdgpu/amdgpu_device.c

+1 −1
Original line number Diff line number Diff line
@@ -2786,7 +2786,7 @@ int amdgpu_device_init(struct amdgpu_device *adev, 
	adev->mman.buffer_funcs = NULL;

	adev->mman.buffer_funcs_ring = NULL;

	adev->vm_manager.vm_pte_funcs = NULL;

	adev->vm_manager.vm_pte_num_rqs = 0;

	adev->vm_manager.vm_pte_num_scheds = 0;

	adev->gmc.gmc_funcs = NULL;

	adev->fence_context = dma_fence_context_alloc(AMDGPU_MAX_RINGS);

	bitmap_zero(adev->gfx.pipe_reserve_bitmap, AMDGPU_MAX_COMPUTE_QUEUES);

drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c

+4 −7
Original line number Diff line number Diff line
@@ -2740,7 +2740,6 @@ int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm, 
{

	struct amdgpu_bo_param bp;

	struct amdgpu_bo *root;

	struct drm_gpu_scheduler *sched_list[AMDGPU_MAX_RINGS];

	int r, i;



	vm->va = RB_ROOT_CACHED;
@@ -2754,19 +2753,17 @@ int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm, 
	spin_lock_init(&vm->invalidated_lock);

	INIT_LIST_HEAD(&vm->freed);



	for (i = 0; i < adev->vm_manager.vm_pte_num_rqs; i++)

		sched_list[i] = adev->vm_manager.vm_pte_rqs[i]->sched;



	/* create scheduler entities for page table updates */

	r = drm_sched_entity_init(&vm->direct, DRM_SCHED_PRIORITY_NORMAL,

				  sched_list, adev->vm_manager.vm_pte_num_rqs,

				  NULL);

				  adev->vm_manager.vm_pte_scheds,

				  adev->vm_manager.vm_pte_num_scheds, NULL);

	if (r)

		return r;



	r = drm_sched_entity_init(&vm->delayed, DRM_SCHED_PRIORITY_NORMAL,

				  sched_list, adev->vm_manager.vm_pte_num_rqs,

				  NULL);

				  adev->vm_manager.vm_pte_scheds,

				  adev->vm_manager.vm_pte_num_scheds, NULL);

	if (r)

		goto error_free_direct;

drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h

+2 −2
Original line number Diff line number Diff line
@@ -327,8 +327,8 @@ struct amdgpu_vm_manager { 
	u64					vram_base_offset;

	/* vm pte handling */

	const struct amdgpu_vm_pte_funcs	*vm_pte_funcs;

	struct drm_sched_rq			*vm_pte_rqs[AMDGPU_MAX_RINGS];

	unsigned				vm_pte_num_rqs;

	struct drm_gpu_scheduler		*vm_pte_scheds[AMDGPU_MAX_RINGS];

	unsigned				vm_pte_num_scheds;

	struct amdgpu_ring			*page_fault;



	/* partial resident texture handling */

drivers/gpu/drm/amd/amdgpu/cik_sdma.c

+3 −5
Original line number Diff line number Diff line
@@ -1372,16 +1372,14 @@ static const struct amdgpu_vm_pte_funcs cik_sdma_vm_pte_funcs = { 


static void cik_sdma_set_vm_pte_funcs(struct amdgpu_device *adev)

{

	struct drm_gpu_scheduler *sched;

	unsigned i;



	adev->vm_manager.vm_pte_funcs = &cik_sdma_vm_pte_funcs;

	for (i = 0; i < adev->sdma.num_instances; i++) {

		sched = &adev->sdma.instance[i].ring.sched;

		adev->vm_manager.vm_pte_rqs[i] =

			&sched->sched_rq[DRM_SCHED_PRIORITY_KERNEL];

		adev->vm_manager.vm_pte_scheds[i] =

			&adev->sdma.instance[i].ring.sched;

	}

	adev->vm_manager.vm_pte_num_rqs = adev->sdma.num_instances;

	adev->vm_manager.vm_pte_num_scheds = adev->sdma.num_instances;

}



const struct amdgpu_ip_block_version cik_sdma_ip_block =

drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c

+3 −5
Original line number Diff line number Diff line
@@ -1260,16 +1260,14 @@ static const struct amdgpu_vm_pte_funcs sdma_v2_4_vm_pte_funcs = { 


static void sdma_v2_4_set_vm_pte_funcs(struct amdgpu_device *adev)

{

	struct drm_gpu_scheduler *sched;

	unsigned i;



	adev->vm_manager.vm_pte_funcs = &sdma_v2_4_vm_pte_funcs;

	for (i = 0; i < adev->sdma.num_instances; i++) {

		sched = &adev->sdma.instance[i].ring.sched;

		adev->vm_manager.vm_pte_rqs[i] =

			&sched->sched_rq[DRM_SCHED_PRIORITY_KERNEL];

		adev->vm_manager.vm_pte_scheds[i] =

			&adev->sdma.instance[i].ring.sched;

	}

	adev->vm_manager.vm_pte_num_rqs = adev->sdma.num_instances;

	adev->vm_manager.vm_pte_num_scheds = adev->sdma.num_instances;

}



const struct amdgpu_ip_block_version sdma_v2_4_ip_block =

CRA Git | Maintained and supported by SUSTech CRA and CCSE