[PATCH] drm/amdgpu: rename amdgpu_bo_get_preferred_pin_domain.

[Christian König]

Am 25.08.21 um 11:14 schrieb Yifan Zhang:
> amdgpu_bo_get_preferred_pin_domain is used for page tables
> creation, which is not involved with page pinning. And it is used in
> more cases than display scanout, modify its documentation as well.
>
> Signed-off-by: Yifan Zhang <yifan1.zhang at amd.com>

Reviewed-by: Christian König <christian.koenig at amd.com>

> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c    | 2 +-
>   drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 8 ++++----
>   drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 2 +-
>   drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c     | 2 +-
>   4 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
> index 9f952b7fc197..85b292ed5c43 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
> @@ -903,7 +903,7 @@ int amdgpu_mode_dumb_create(struct drm_file *file_priv,
>   					 DIV_ROUND_UP(args->bpp, 8), 0);
>   	args->size = (u64)args->pitch * args->height;
>   	args->size = ALIGN(args->size, PAGE_SIZE);
> -	domain = amdgpu_bo_get_preferred_pin_domain(adev,
> +	domain = amdgpu_bo_get_preferred_domain(adev,
>   				amdgpu_display_supported_domains(adev, flags));
>   	r = amdgpu_gem_object_create(adev, args->size, 0, domain, flags,
>   				     ttm_bo_type_device, NULL, &gobj);
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
> index 22a1344082d3..65a9b23f0a46 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
> @@ -947,7 +947,7 @@ int amdgpu_bo_pin_restricted(struct amdgpu_bo *bo, u32 domain,
>   	/* This assumes only APU display buffers are pinned with (VRAM|GTT).
>   	 * See function amdgpu_display_supported_domains()
>   	 */
> -	domain = amdgpu_bo_get_preferred_pin_domain(adev, domain);
> +	domain = amdgpu_bo_get_preferred_domain(adev, domain);
>   
>   	if (bo->tbo.base.import_attach)
>   		dma_buf_pin(bo->tbo.base.import_attach);
> @@ -1518,14 +1518,14 @@ u64 amdgpu_bo_gpu_offset_no_check(struct amdgpu_bo *bo)
>   }
>   
>   /**
> - * amdgpu_bo_get_preferred_pin_domain - get preferred domain for scanout
> + * amdgpu_bo_get_preferred_domain - get preferred domain
>    * @adev: amdgpu device object
>    * @domain: allowed :ref:`memory domains <amdgpu_memory_domains>`
>    *
>    * Returns:
> - * Which of the allowed domains is preferred for pinning the BO for scanout.
> + * Which of the allowed domains is preferred for allocating the BO.
>    */
> -uint32_t amdgpu_bo_get_preferred_pin_domain(struct amdgpu_device *adev,
> +uint32_t amdgpu_bo_get_preferred_domain(struct amdgpu_device *adev,
>   					    uint32_t domain)
>   {
>   	if (domain == (AMDGPU_GEM_DOMAIN_VRAM | AMDGPU_GEM_DOMAIN_GTT)) {
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h
> index 38c834d0f930..5d746007b317 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h
> @@ -334,7 +334,7 @@ void amdgpu_bo_get_memory(struct amdgpu_bo *bo, uint64_t *vram_mem,
>   void amdgpu_bo_add_to_shadow_list(struct amdgpu_bo_vm *vmbo);
>   int amdgpu_bo_restore_shadow(struct amdgpu_bo *shadow,
>   			     struct dma_fence **fence);
> -uint32_t amdgpu_bo_get_preferred_pin_domain(struct amdgpu_device *adev,
> +uint32_t amdgpu_bo_get_preferred_domain(struct amdgpu_device *adev,
>   					    uint32_t domain);
>   
>   /*
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
> index 0b893aa21ffe..6b15cad78de9 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
> @@ -926,7 +926,7 @@ static int amdgpu_vm_pt_create(struct amdgpu_device *adev,
>   	bp.size = amdgpu_vm_bo_size(adev, level);
>   	bp.byte_align = AMDGPU_GPU_PAGE_SIZE;
>   	bp.domain = AMDGPU_GEM_DOMAIN_VRAM;
> -	bp.domain = amdgpu_bo_get_preferred_pin_domain(adev, bp.domain);
> +	bp.domain = amdgpu_bo_get_preferred_domain(adev, bp.domain);
>   	bp.flags = AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS |
>   		AMDGPU_GEM_CREATE_CPU_GTT_USWC;
>