diff options
author | Felix Kuehling <Felix.Kuehling@amd.com> | 2019-02-04 17:53:05 -0500 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2019-02-13 17:50:39 -0500 |
commit | c60cd590cb7da0d7dbb423727bb67350182a371c (patch) | |
tree | 4e43ece34c5ed33640bc2e406ad1e972bace40c0 /drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | |
parent | e8e32426b1271d3387208c3a6eaf7c166bea9975 (diff) |
drm/amdgpu: Replace ttm_bo_wait with amdgpu_bo_sync_wait
The fence_owner logic in amdgpu_sync_wait will allow waiting without
having to temporarily remove eviction fences.
Signed-off-by: Felix Kuehling <Felix.Kuehling@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c index d7b10d79f1de..44a1581f6b8f 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | |||
@@ -355,7 +355,7 @@ static int amdgpu_amdkfd_bo_validate(struct amdgpu_bo *bo, uint32_t domain, | |||
355 | if (ret) | 355 | if (ret) |
356 | goto validate_fail; | 356 | goto validate_fail; |
357 | 357 | ||
358 | ttm_bo_wait(&bo->tbo, false, false); | 358 | amdgpu_bo_sync_wait(bo, AMDGPU_FENCE_OWNER_KFD, false); |
359 | amdgpu_amdkfd_add_eviction_fence(bo, ef_list, ef_count); | 359 | amdgpu_amdkfd_add_eviction_fence(bo, ef_list, ef_count); |
360 | } | 360 | } |
361 | 361 | ||
@@ -1002,7 +1002,7 @@ static int init_kfd_vm(struct amdgpu_vm *vm, void **process_info, | |||
1002 | pr_err("validate_pt_pd_bos() failed\n"); | 1002 | pr_err("validate_pt_pd_bos() failed\n"); |
1003 | goto validate_pd_fail; | 1003 | goto validate_pd_fail; |
1004 | } | 1004 | } |
1005 | ret = ttm_bo_wait(&vm->root.base.bo->tbo, false, false); | 1005 | amdgpu_bo_sync_wait(vm->root.base.bo, AMDGPU_FENCE_OWNER_KFD, false); |
1006 | if (ret) | 1006 | if (ret) |
1007 | goto wait_pd_fail; | 1007 | goto wait_pd_fail; |
1008 | amdgpu_bo_fence(vm->root.base.bo, | 1008 | amdgpu_bo_fence(vm->root.base.bo, |