Skip to content

Commit d035f84

Browse files
yifancomalexdeucher
authored andcommitted
drm/amdgpu: rename amdgpu_bo_get_preferred_pin_domain
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 <[email protected]> Reviewed-by: Christian König <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
1 parent 416e1fa commit d035f84

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -904,7 +904,7 @@ int amdgpu_mode_dumb_create(struct drm_file *file_priv,
904904
DIV_ROUND_UP(args->bpp, 8), 0);
905905
args->size = (u64)args->pitch * args->height;
906906
args->size = ALIGN(args->size, PAGE_SIZE);
907-
domain = amdgpu_bo_get_preferred_pin_domain(adev,
907+
domain = amdgpu_bo_get_preferred_domain(adev,
908908
amdgpu_display_supported_domains(adev, flags));
909909
r = amdgpu_gem_object_create(adev, args->size, 0, domain, flags,
910910
ttm_bo_type_device, NULL, &gobj);

drivers/gpu/drm/amd/amdgpu/amdgpu_object.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -947,7 +947,7 @@ int amdgpu_bo_pin_restricted(struct amdgpu_bo *bo, u32 domain,
947947
/* This assumes only APU display buffers are pinned with (VRAM|GTT).
948948
* See function amdgpu_display_supported_domains()
949949
*/
950-
domain = amdgpu_bo_get_preferred_pin_domain(adev, domain);
950+
domain = amdgpu_bo_get_preferred_domain(adev, domain);
951951

952952
if (bo->tbo.base.import_attach)
953953
dma_buf_pin(bo->tbo.base.import_attach);
@@ -1518,14 +1518,14 @@ u64 amdgpu_bo_gpu_offset_no_check(struct amdgpu_bo *bo)
15181518
}
15191519

15201520
/**
1521-
* amdgpu_bo_get_preferred_pin_domain - get preferred domain for scanout
1521+
* amdgpu_bo_get_preferred_domain - get preferred domain
15221522
* @adev: amdgpu device object
15231523
* @domain: allowed :ref:`memory domains <amdgpu_memory_domains>`
15241524
*
15251525
* Returns:
1526-
* Which of the allowed domains is preferred for pinning the BO for scanout.
1526+
* Which of the allowed domains is preferred for allocating the BO.
15271527
*/
1528-
uint32_t amdgpu_bo_get_preferred_pin_domain(struct amdgpu_device *adev,
1528+
uint32_t amdgpu_bo_get_preferred_domain(struct amdgpu_device *adev,
15291529
uint32_t domain)
15301530
{
15311531
if (domain == (AMDGPU_GEM_DOMAIN_VRAM | AMDGPU_GEM_DOMAIN_GTT)) {

drivers/gpu/drm/amd/amdgpu/amdgpu_object.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ void amdgpu_bo_get_memory(struct amdgpu_bo *bo, uint64_t *vram_mem,
333333
void amdgpu_bo_add_to_shadow_list(struct amdgpu_bo_vm *vmbo);
334334
int amdgpu_bo_restore_shadow(struct amdgpu_bo *shadow,
335335
struct dma_fence **fence);
336-
uint32_t amdgpu_bo_get_preferred_pin_domain(struct amdgpu_device *adev,
336+
uint32_t amdgpu_bo_get_preferred_domain(struct amdgpu_device *adev,
337337
uint32_t domain);
338338

339339
/*

drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -926,7 +926,7 @@ static int amdgpu_vm_pt_create(struct amdgpu_device *adev,
926926
bp.size = amdgpu_vm_bo_size(adev, level);
927927
bp.byte_align = AMDGPU_GPU_PAGE_SIZE;
928928
bp.domain = AMDGPU_GEM_DOMAIN_VRAM;
929-
bp.domain = amdgpu_bo_get_preferred_pin_domain(adev, bp.domain);
929+
bp.domain = amdgpu_bo_get_preferred_domain(adev, bp.domain);
930930
bp.flags = AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS |
931931
AMDGPU_GEM_CREATE_CPU_GTT_USWC;
932932

0 commit comments

Comments
 (0)