[PATCH 5/7] drm/amdgpu: always reserve two slots for the VM

[Michel Dänzer]

On 2018-09-24 1:58 p.m., Christian König wrote:
> And drop the now superflous extra reservations.
> 
> Signed-off-by: Christian König <christian.koenig at amd.com>
> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c |  4 ----
>  drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 14 +++++---------
>  2 files changed, 5 insertions(+), 13 deletions(-)
> 
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
> index 1a2ea2e931e3..cda8cf90777c 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
> @@ -962,10 +962,6 @@ static int amdgpu_cs_vm_handling(struct amdgpu_cs_parser *p)
>  	if (r)
>  		return r;
>  
> -	r = reservation_object_reserve_shared(vm->root.base.bo->tbo.resv, 1);
> -	if (r)
> -		return r;
> -
>  	p->job->vm_pd_addr = amdgpu_gmc_pd_addr(vm->root.base.bo);
>  
>  	if (amdgpu_vm_debug) {
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
> index bdce05183edb..353367382874 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
> @@ -616,7 +616,7 @@ void amdgpu_vm_get_pd_bo(struct amdgpu_vm *vm,
>  {
>  	entry->priority = 0;
>  	entry->tv.bo = &vm->root.base.bo->tbo;
> -	entry->tv.shared = true;
> +	entry->tv.shared = 2;

Where assigning values > 1 to this field, it would be good to have a
comment explaining what the multiple shared fence slots correspond to.
Same for patch 6.


-- 
Earthling Michel Dänzer               |               http://www.amd.com
Libre software enthusiast             |             Mesa and X developer