[PATCH 10/11] drm/amdgpu: add helper for VM PD/PT allocation parameters

[Zhang, Jerry (Junwei)]

On 08/22/2018 11:05 PM, Christian König wrote:
> Add a helper function to figure them out only once.
>
> Signed-off-by: Christian König <christian.koenig at amd.com>
Reviewed-by: Junwei Zhang <Jerry.Zhang at amd.com>

> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 61 ++++++++++++--------------
>   1 file changed, 28 insertions(+), 33 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
> index 87e3d44b0a3f..928fdae0dab4 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
> @@ -446,6 +446,31 @@ static int amdgpu_vm_clear_bo(struct amdgpu_device *adev,
>   	return r;
>   }
>
> +/**
> + * amdgpu_vm_bo_param - fill in parameters for PD/PT allocation
> + *
> + * @adev: amdgpu_device pointer
> + * @vm: requesting vm
> + * @bp: resulting BO allocation parameters
> + */
> +static void amdgpu_vm_bo_param(struct amdgpu_device *adev, struct amdgpu_vm *vm,
> +			       int level, struct amdgpu_bo_param *bp)
> +{
> +	memset(&bp, 0, sizeof(bp));
> +
> +	bp->size = amdgpu_vm_bo_size(adev, level);
> +	bp->byte_align = AMDGPU_GPU_PAGE_SIZE;
> +	bp->domain = AMDGPU_GEM_DOMAIN_VRAM;
> +	bp->flags = AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS;
> +	if (vm->use_cpu_for_update)
> +		bp->flags |= AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED;
> +	else
> +		bp->flags |= AMDGPU_GEM_CREATE_SHADOW;
> +	bp->type = ttm_bo_type_kernel;
> +	if (vm->root.base.bo)
> +		bp->resv = vm->root.base.bo->tbo.resv;
> +}
> +
>   /**
>    * amdgpu_vm_alloc_levels - allocate the PD/PT levels
>    *
> @@ -469,8 +494,8 @@ static int amdgpu_vm_alloc_levels(struct amdgpu_device *adev,
>   				  unsigned level, bool ats)
>   {
>   	unsigned shift = amdgpu_vm_level_shift(adev, level);
> +	struct amdgpu_bo_param bp;
>   	unsigned pt_idx, from, to;
> -	u64 flags;
>   	int r;
>
>   	if (!parent->entries) {
> @@ -494,29 +519,14 @@ static int amdgpu_vm_alloc_levels(struct amdgpu_device *adev,
>   	saddr = saddr & ((1 << shift) - 1);
>   	eaddr = eaddr & ((1 << shift) - 1);
>
> -	flags = AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS;
> -	if (vm->use_cpu_for_update)
> -		flags |= AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED;
> -	else
> -		flags |= (AMDGPU_GEM_CREATE_NO_CPU_ACCESS |
> -				AMDGPU_GEM_CREATE_SHADOW);
> +	amdgpu_vm_bo_param(adev, vm, level, &bp);
>
>   	/* walk over the address space and allocate the page tables */
>   	for (pt_idx = from; pt_idx <= to; ++pt_idx) {
> -		struct reservation_object *resv = vm->root.base.bo->tbo.resv;
>   		struct amdgpu_vm_pt *entry = &parent->entries[pt_idx];
>   		struct amdgpu_bo *pt;
>
>   		if (!entry->base.bo) {
> -			struct amdgpu_bo_param bp;
> -
> -			memset(&bp, 0, sizeof(bp));
> -			bp.size = amdgpu_vm_bo_size(adev, level);
> -			bp.byte_align = AMDGPU_GPU_PAGE_SIZE;
> -			bp.domain = AMDGPU_GEM_DOMAIN_VRAM;
> -			bp.flags = flags;
> -			bp.type = ttm_bo_type_kernel;
> -			bp.resv = resv;
>   			r = amdgpu_bo_create(adev, &bp, &pt);
>   			if (r)
>   				return r;
> @@ -2564,8 +2574,6 @@ int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm,
>   {
>   	struct amdgpu_bo_param bp;
>   	struct amdgpu_bo *root;
> -	unsigned long size;
> -	uint64_t flags;
>   	int r, i;
>
>   	vm->va = RB_ROOT_CACHED;
> @@ -2602,20 +2610,7 @@ int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm,
>   		  "CPU update of VM recommended only for large BAR system\n");
>   	vm->last_update = NULL;
>
> -	flags = AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS;
> -	if (vm->use_cpu_for_update)
> -		flags |= AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED;
> -	else
> -		flags |= AMDGPU_GEM_CREATE_SHADOW;
> -
> -	size = amdgpu_vm_bo_size(adev, adev->vm_manager.root_level);
> -	memset(&bp, 0, sizeof(bp));
> -	bp.size = size;
> -	bp.byte_align = AMDGPU_GPU_PAGE_SIZE;
> -	bp.domain = AMDGPU_GEM_DOMAIN_VRAM;
> -	bp.flags = flags;
> -	bp.type = ttm_bo_type_kernel;
> -	bp.resv = NULL;
> +	amdgpu_vm_bo_param(adev, vm, adev->vm_manager.root_level, &bp);
>   	r = amdgpu_bo_create(adev, &bp, &root);
>   	if (r)
>   		goto error_free_sched_entity;
>