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

drm/scheduler: rework entity creation 



Entity currently keeps a copy of run_queue list and modify it in
drm_sched_entity_set_priority(). Entities shouldn't modify run_queue
list. Use drm_gpu_scheduler list instead of drm_sched_rq list
in drm_sched_entity struct. In this way we can select a runqueue based
on entity/ctx's priority for a  drm scheduler.

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 45a80abe

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

+4 −3
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ static int amdgpu_ctx_init(struct amdgpu_device *adev, 


	for (i = 0; i < AMDGPU_HW_IP_NUM; ++i) {

		struct amdgpu_ring *rings[AMDGPU_MAX_RINGS];

		struct drm_sched_rq *rqs[AMDGPU_MAX_RINGS];

		struct drm_gpu_scheduler *sched_list[AMDGPU_MAX_RINGS];

		unsigned num_rings = 0;

		unsigned num_rqs = 0;
@@ -181,12 +181,13 @@ static int amdgpu_ctx_init(struct amdgpu_device *adev, 
			if (!rings[j]->adev)

				continue;



			rqs[num_rqs++] = &rings[j]->sched.sched_rq[priority];

			sched_list[num_rqs++] = &rings[j]->sched;

		}



		for (j = 0; j < amdgpu_ctx_num_entities[i]; ++j)

			r = drm_sched_entity_init(&ctx->entities[i][j].entity,

						  rqs, num_rqs, &ctx->guilty);

						  priority, sched_list,

						  num_rqs, &ctx->guilty);

		if (r)

			goto error_cleanup_entities;

	}

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

+5 −3
Original line number Diff line number Diff line
@@ -1987,11 +1987,13 @@ void amdgpu_ttm_set_buffer_funcs_status(struct amdgpu_device *adev, bool enable) 


	if (enable) {

		struct amdgpu_ring *ring;

		struct drm_sched_rq *rq;

		struct drm_gpu_scheduler *sched;



		ring = adev->mman.buffer_funcs_ring;

		rq = &ring->sched.sched_rq[DRM_SCHED_PRIORITY_KERNEL];

		r = drm_sched_entity_init(&adev->mman.entity, &rq, 1, NULL);

		sched = &ring->sched;

		r = drm_sched_entity_init(&adev->mman.entity,

				          DRM_SCHED_PRIORITY_KERNEL, &sched,

					  1, NULL);

		if (r) {

			DRM_ERROR("Failed setting up TTM BO move entity (%d)\n",

				  r);

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

+4 −3
Original line number Diff line number Diff line
@@ -330,12 +330,13 @@ int amdgpu_uvd_sw_fini(struct amdgpu_device *adev) 
int amdgpu_uvd_entity_init(struct amdgpu_device *adev)

{

	struct amdgpu_ring *ring;

	struct drm_sched_rq *rq;

	struct drm_gpu_scheduler *sched;

	int r;



	ring = &adev->uvd.inst[0].ring;

	rq = &ring->sched.sched_rq[DRM_SCHED_PRIORITY_NORMAL];

	r = drm_sched_entity_init(&adev->uvd.entity, &rq, 1, NULL);

	sched = &ring->sched;

	r = drm_sched_entity_init(&adev->uvd.entity, DRM_SCHED_PRIORITY_NORMAL,

				  &sched, 1, NULL);

	if (r) {

		DRM_ERROR("Failed setting up UVD kernel entity.\n");

		return r;

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

+4 −3
Original line number Diff line number Diff line
@@ -240,12 +240,13 @@ int amdgpu_vce_sw_fini(struct amdgpu_device *adev) 
int amdgpu_vce_entity_init(struct amdgpu_device *adev)

{

	struct amdgpu_ring *ring;

	struct drm_sched_rq *rq;

	struct drm_gpu_scheduler *sched;

	int r;



	ring = &adev->vce.ring[0];

	rq = &ring->sched.sched_rq[DRM_SCHED_PRIORITY_NORMAL];

	r = drm_sched_entity_init(&adev->vce.entity, &rq, 1, NULL);

	sched = &ring->sched;

	r = drm_sched_entity_init(&adev->vce.entity, DRM_SCHED_PRIORITY_NORMAL,

				  &sched, 1, NULL);

	if (r != 0) {

		DRM_ERROR("Failed setting up VCE run queue.\n");

		return r;

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

+10 −4
Original line number Diff line number Diff line
@@ -2740,6 +2740,7 @@ 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;
@@ -2753,14 +2754,19 @@ 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, adev->vm_manager.vm_pte_rqs,

				  adev->vm_manager.vm_pte_num_rqs, NULL);

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

				  sched_list, adev->vm_manager.vm_pte_num_rqs,

				  NULL);

	if (r)

		return r;



	r = drm_sched_entity_init(&vm->delayed, adev->vm_manager.vm_pte_rqs,

				  adev->vm_manager.vm_pte_num_rqs, NULL);

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

				  sched_list, adev->vm_manager.vm_pte_num_rqs,

				  NULL);

	if (r)

		goto error_free_direct;

CRA Git | Maintained and supported by SUSTech CRA and CCSE