aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
diff options
context:
space:
mode:
authorChristian König <christian.koenig@amd.com>2016-02-08 06:13:05 -0500
committerAlex Deucher <alexander.deucher@amd.com>2016-02-10 14:17:24 -0500
commite86f9ceee19ec028ae79a09fe1eaabf315d67969 (patch)
tree5f9863ae2b5d30ff4dc3579d0395ea486d735d92 /drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
parent9f2ade33e659250a810e5bdab0c602085792d5b6 (diff)
drm/amdgpu: move sync into job object
No need to keep that for every IB. Signed-off-by: Christian König <christian.koenig@amd.com> Acked-by: Alex Deucher <alexander.deucher@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.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
index fb003089f73c..b291b1a4611a 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
@@ -473,7 +473,8 @@ int amdgpu_vm_update_page_directory(struct amdgpu_device *adev,
473 473
474 if (ib->length_dw != 0) { 474 if (ib->length_dw != 0) {
475 amdgpu_ring_pad_ib(ring, ib); 475 amdgpu_ring_pad_ib(ring, ib);
476 amdgpu_sync_resv(adev, &ib->sync, pd->tbo.resv, AMDGPU_FENCE_OWNER_VM); 476 amdgpu_sync_resv(adev, &job->sync, pd->tbo.resv,
477 AMDGPU_FENCE_OWNER_VM);
477 WARN_ON(ib->length_dw > ndw); 478 WARN_ON(ib->length_dw > ndw);
478 r = amdgpu_job_submit(job, ring, AMDGPU_FENCE_OWNER_VM, &fence); 479 r = amdgpu_job_submit(job, ring, AMDGPU_FENCE_OWNER_VM, &fence);
479 if (r) 480 if (r)
@@ -714,7 +715,7 @@ static int amdgpu_vm_bo_update_mapping(struct amdgpu_device *adev,
714 715
715 ib = &job->ibs[0]; 716 ib = &job->ibs[0];
716 717
717 r = amdgpu_sync_resv(adev, &ib->sync, vm->page_directory->tbo.resv, 718 r = amdgpu_sync_resv(adev, &job->sync, vm->page_directory->tbo.resv,
718 owner); 719 owner);
719 if (r) 720 if (r)
720 goto error_free; 721 goto error_free;