forked from mirrors/linux
		
	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>
This commit is contained in:
		
							parent
							
								
									e8e32426b1
								
							
						
					
					
						commit
						c60cd590cb
					
				
					 1 changed files with 2 additions and 2 deletions
				
			
		| 
						 | 
				
			
			@ -355,7 +355,7 @@ static int amdgpu_amdkfd_bo_validate(struct amdgpu_bo *bo, uint32_t domain,
 | 
			
		|||
		if (ret)
 | 
			
		||||
			goto validate_fail;
 | 
			
		||||
 | 
			
		||||
		ttm_bo_wait(&bo->tbo, false, false);
 | 
			
		||||
		amdgpu_bo_sync_wait(bo, AMDGPU_FENCE_OWNER_KFD, false);
 | 
			
		||||
		amdgpu_amdkfd_add_eviction_fence(bo, ef_list, ef_count);
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -1002,7 +1002,7 @@ static int init_kfd_vm(struct amdgpu_vm *vm, void **process_info,
 | 
			
		|||
		pr_err("validate_pt_pd_bos() failed\n");
 | 
			
		||||
		goto validate_pd_fail;
 | 
			
		||||
	}
 | 
			
		||||
	ret = ttm_bo_wait(&vm->root.base.bo->tbo, false, false);
 | 
			
		||||
	amdgpu_bo_sync_wait(vm->root.base.bo, AMDGPU_FENCE_OWNER_KFD, false);
 | 
			
		||||
	if (ret)
 | 
			
		||||
		goto wait_pd_fail;
 | 
			
		||||
	amdgpu_bo_fence(vm->root.base.bo,
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in a new issue