[PATCH] drm/amdgpu: add VM update fences back to the root PD v2

[Pan, Xinhui]

Reviewed-by: xinhui pan <xinhui.pan at amd.com>

> 2020年2月25日 20:45，Christian König <ckoenig.leichtzumerken at gmail.com> 写道：
> 
> Am 19.02.20 um 16:02 schrieb Christian König:
>> Add update fences to the root PD while mapping BOs.
>> 
>> Otherwise PDs freed during the mapping won't wait for
>> updates to finish and can cause corruptions.
>> 
>> v2: rebased on drm-misc-next
>> 
>> Signed-off-by: Christian König <christian.koenig at amd.com>
>> Fixes: 90b69cdc5f159 drm/amdgpu: stop adding VM updates fences to the resv obj
> 
> Felix and Xinhui can I get an rb or at least Acked-by for this patch? It is a major problem for testing which needs to get fixed.
> 
> Thanks,
> Christian.
> 
>> ---
>>  drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 14 ++++++++++++--
>>  1 file changed, 12 insertions(+), 2 deletions(-)
>> 
>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
>> index d16231d6a790..ef73fa94f357 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
>> @@ -588,8 +588,8 @@ void amdgpu_vm_get_pd_bo(struct amdgpu_vm *vm,
>>  {
>>  	entry->priority = 0;
>>  	entry->tv.bo = &vm->root.base.bo->tbo;
>> -	/* One for TTM and one for the CS job */
>> -	entry->tv.num_shared = 2;
>> +	/* Two for VM updates, one for TTM and one for the CS job */
>> +	entry->tv.num_shared = 4;
>>  	entry->user_pages = NULL;
>>  	list_add(&entry->tv.head, validated);
>>  }
>> @@ -1591,6 +1591,16 @@ static int amdgpu_vm_bo_update_mapping(struct amdgpu_device *adev,
>>  		goto error_unlock;
>>  	}
>>  +	if (flags & AMDGPU_PTE_VALID) {
>> +		struct amdgpu_bo *root = vm->root.base.bo;
>> +
>> +		if (!dma_fence_is_signaled(vm->last_direct))
>> +			amdgpu_bo_fence(root, vm->last_direct, true);
>> +
>> +		if (!dma_fence_is_signaled(vm->last_delayed))
>> +			amdgpu_bo_fence(root, vm->last_delayed, true);
>> +	}
>> +
>>  	r = vm->update_funcs->prepare(&params, owner, exclusive);
>>  	if (r)
>>  		goto error_unlock;
>