Commit aa16b6c6 authored Jul 13, 2018 by Nayan Deshmukh Committed by Alex Deucher Jul 13, 2018

drm/scheduler: modify args of drm_sched_entity_init



replace run queue by a list of run queues and remove the
sched arg as that is part of run queue itself

Signed-off-by: Nayan Deshmukh <nayan26deshmukh@gmail.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Acked-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

parent 8dc9fbbf

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -90,8 +90,8 @@ static int amdgpu_ctx_init(struct amdgpu_device *adev,
		if (ring == &adev->gfx.kiq.ring)
		continue;

		r = drm_sched_entity_init(&ring->sched, &ctx->rings[i].entity,
		rq, &ctx->guilty);
		r = drm_sched_entity_init(&ctx->rings[i].entity,
		&rq, 1, &ctx->guilty);
		if (r)
		goto failed;
		}

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

+1 −2

Original line number	Diff line number	Diff line
		@@ -1918,8 +1918,7 @@ void amdgpu_ttm_set_buffer_funcs_status(struct amdgpu_device *adev, bool enable)

		ring = adev->mman.buffer_funcs_ring;
		rq = &ring->sched.sched_rq[DRM_SCHED_PRIORITY_KERNEL];
		r = drm_sched_entity_init(&ring->sched, &adev->mman.entity,
		rq, NULL);
		r = drm_sched_entity_init(&adev->mman.entity, &rq, 1, NULL);
		if (r) {
		DRM_ERROR("Failed setting up TTM BO move entity (%d)\n",
		r);

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -266,8 +266,8 @@ int amdgpu_uvd_sw_init(struct amdgpu_device *adev)

		ring = &adev->uvd.inst[j].ring;
		rq = &ring->sched.sched_rq[DRM_SCHED_PRIORITY_NORMAL];
		r = drm_sched_entity_init(&ring->sched, &adev->uvd.inst[j].entity,
		rq, NULL);
		r = drm_sched_entity_init(&adev->uvd.inst[j].entity, &rq,
		1, NULL);
		if (r != 0) {
		DRM_ERROR("Failed setting up UVD(%d) run queue.\n", j);
		return r;

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

+1 −2

Original line number	Diff line number	Diff line
		@@ -190,8 +190,7 @@ int amdgpu_vce_sw_init(struct amdgpu_device *adev, unsigned long size)

		ring = &adev->vce.ring[0];
		rq = &ring->sched.sched_rq[DRM_SCHED_PRIORITY_NORMAL];
		r = drm_sched_entity_init(&ring->sched, &adev->vce.entity,
		rq, NULL);
		r = drm_sched_entity_init(&adev->vce.entity, &rq, 1, NULL);
		if (r != 0) {
		DRM_ERROR("Failed setting up VCE run queue.\n");
		return r;

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

+1 −2

Original line number	Diff line number	Diff line
		@@ -2564,8 +2564,7 @@ int amdgpu_vm_init(struct amdgpu_device adev, struct amdgpu_vm vm,
		ring_instance %= adev->vm_manager.vm_pte_num_rings;
		ring = adev->vm_manager.vm_pte_rings[ring_instance];
		rq = &ring->sched.sched_rq[DRM_SCHED_PRIORITY_KERNEL];
		r = drm_sched_entity_init(&ring->sched, &vm->entity,
		rq, NULL);
		r = drm_sched_entity_init(&vm->entity, &rq, 1, NULL);
		if (r)
		return r;