aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
diff options
context:
space:
mode:
authorChristian König <christian.koenig@amd.com>2018-07-13 07:54:56 -0400
committerAlex Deucher <alexander.deucher@amd.com>2018-07-16 17:11:52 -0400
commit0e28b10ff1b8e65788040b51c30c9cc984060dcd (patch)
tree4ca6f18e88b3345e26b170b54ae2b78e74675342 /drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
parenteb3961a57424a5c3dae44576d1c88e64a818d871 (diff)
drm/amdgpu: remove ring parameter from amdgpu_job_submit
We know the ring through the entity anyway. Signed-off-by: Christian König <christian.koenig@amd.com> Reviewed-by: Junwei Zhang <Jerry.Zhang@amd.com> Acked-by: Chunming Zhou <david1.zhou@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
index 484e2c19c027..5d3d783f2d72 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
@@ -425,8 +425,8 @@ static int amdgpu_vm_clear_bo(struct amdgpu_device *adev,
425 if (r) 425 if (r)
426 goto error_free; 426 goto error_free;
427 427
428 r = amdgpu_job_submit(job, ring, &vm->entity, 428 r = amdgpu_job_submit(job, &vm->entity, AMDGPU_FENCE_OWNER_UNDEFINED,
429 AMDGPU_FENCE_OWNER_UNDEFINED, &fence); 429 &fence);
430 if (r) 430 if (r)
431 goto error_free; 431 goto error_free;
432 432
@@ -1120,8 +1120,8 @@ restart:
1120 amdgpu_sync_resv(adev, &job->sync, root->tbo.resv, 1120 amdgpu_sync_resv(adev, &job->sync, root->tbo.resv,
1121 AMDGPU_FENCE_OWNER_VM, false); 1121 AMDGPU_FENCE_OWNER_VM, false);
1122 WARN_ON(params.ib->length_dw > ndw); 1122 WARN_ON(params.ib->length_dw > ndw);
1123 r = amdgpu_job_submit(job, ring, &vm->entity, 1123 r = amdgpu_job_submit(job, &vm->entity, AMDGPU_FENCE_OWNER_VM,
1124 AMDGPU_FENCE_OWNER_VM, &fence); 1124 &fence);
1125 if (r) 1125 if (r)
1126 goto error; 1126 goto error;
1127 1127
@@ -1485,8 +1485,7 @@ static int amdgpu_vm_bo_update_mapping(struct amdgpu_device *adev,
1485 1485
1486 amdgpu_ring_pad_ib(ring, params.ib); 1486 amdgpu_ring_pad_ib(ring, params.ib);
1487 WARN_ON(params.ib->length_dw > ndw); 1487 WARN_ON(params.ib->length_dw > ndw);
1488 r = amdgpu_job_submit(job, ring, &vm->entity, 1488 r = amdgpu_job_submit(job, &vm->entity, AMDGPU_FENCE_OWNER_VM, &f);
1489 AMDGPU_FENCE_OWNER_VM, &f);
1490 if (r) 1489 if (r)
1491 goto error_free; 1490 goto error_free;
1492 1491