diff options
author | Christian König <christian.koenig@amd.com> | 2015-07-20 10:09:40 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2015-08-17 16:50:16 -0400 |
commit | 7f8a5290f5b6c14dd1d295e2508e0dd193a9fda5 (patch) | |
tree | 37e4c06727d2fedee6bf2db35f1f8c77ae2aba08 /drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | |
parent | fc8fa5e428ae937f79a36ccbe303fa871ffbbbf7 (diff) |
drm/amdgpu: rework vm_grab_id interface
This makes assigning VM IDs independent from the use of VM IDs.
Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Jammy Zhou <Jammy.Zhou@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c index 95d533422a5b..f3ac9d8a5691 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | |||
@@ -165,9 +165,7 @@ int amdgpu_ib_schedule(struct amdgpu_device *adev, unsigned num_ibs, | |||
165 | 165 | ||
166 | if (vm) { | 166 | if (vm) { |
167 | /* grab a vm id if necessary */ | 167 | /* grab a vm id if necessary */ |
168 | struct amdgpu_fence *vm_id_fence = NULL; | 168 | r = amdgpu_vm_grab_id(ibs->vm, ibs->ring, &ibs->sync); |
169 | vm_id_fence = amdgpu_vm_grab_id(ibs->ring, ibs->vm); | ||
170 | r = amdgpu_sync_fence(adev, &ibs->sync, &vm_id_fence->base); | ||
171 | if (r) { | 169 | if (r) { |
172 | amdgpu_ring_unlock_undo(ring); | 170 | amdgpu_ring_unlock_undo(ring); |
173 | return r; | 171 | return r; |