summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian König <christian.koenig@amd.com>2016-03-03 10:50:01 +0100
committerAlex Deucher <alexander.deucher@amd.com>2016-03-08 11:01:45 -0500
commita8bd1bec7c68dd5082012bcdd1d765e65b3ee05c (patch)
treeceb9f1aecab8c166b8a228ea4070597e3211c048
parent13459bd0fb4d178bcbd20cff155f1849313cd3bf (diff)
downloadlinux-a8bd1bec7c68dd5082012bcdd1d765e65b3ee05c.tar.bz2
drm/amdgpu: sync to the active user on reusing a VMID
Signed-off-by: Christian König <christian.koenig@amd.com> Reviewed-by: Chunming Zhou <david1.zhou@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
index d9dc8bea5e98..364db7c45c67 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
@@ -188,6 +188,13 @@ int amdgpu_vm_grab_id(struct amdgpu_vm *vm, struct amdgpu_ring *ring,
if (!is_later && owner == (long)id &&
pd_addr == id->pd_gpu_addr) {
+ r = amdgpu_sync_fence(ring->adev, sync,
+ id->mgr_id->active);
+ if (r) {
+ mutex_unlock(&adev->vm_manager.lock);
+ return r;
+ }
+
fence_put(id->mgr_id->active);
id->mgr_id->active = fence_get(fence);