Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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 <yifan1.zhang@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Yifan Zhang and committed by
Alex Deucher
d035f84d 416e1fab

+7 -7
+1 -1
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
··· 904 904 DIV_ROUND_UP(args->bpp, 8), 0); 905 905 args->size = (u64)args->pitch * args->height; 906 906 args->size = ALIGN(args->size, PAGE_SIZE); 907 - domain = amdgpu_bo_get_preferred_pin_domain(adev, 907 + domain = amdgpu_bo_get_preferred_domain(adev, 908 908 amdgpu_display_supported_domains(adev, flags)); 909 909 r = amdgpu_gem_object_create(adev, args->size, 0, domain, flags, 910 910 ttm_bo_type_device, NULL, &gobj);
+4 -4
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
··· 947 947 /* This assumes only APU display buffers are pinned with (VRAM|GTT). 948 948 * See function amdgpu_display_supported_domains() 949 949 */ 950 - domain = amdgpu_bo_get_preferred_pin_domain(adev, domain); 950 + domain = amdgpu_bo_get_preferred_domain(adev, domain); 951 951 952 952 if (bo->tbo.base.import_attach) 953 953 dma_buf_pin(bo->tbo.base.import_attach); ··· 1518 1518 } 1519 1519 1520 1520 /** 1521 - * amdgpu_bo_get_preferred_pin_domain - get preferred domain for scanout 1521 + * amdgpu_bo_get_preferred_domain - get preferred domain 1522 1522 * @adev: amdgpu device object 1523 1523 * @domain: allowed :ref:`memory domains <amdgpu_memory_domains>` 1524 1524 * 1525 1525 * 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. 1527 1527 */ 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, 1529 1529 uint32_t domain) 1530 1530 { 1531 1531 if (domain == (AMDGPU_GEM_DOMAIN_VRAM | AMDGPU_GEM_DOMAIN_GTT)) {
+1 -1
drivers/gpu/drm/amd/amdgpu/amdgpu_object.h
··· 333 333 void amdgpu_bo_add_to_shadow_list(struct amdgpu_bo_vm *vmbo); 334 334 int amdgpu_bo_restore_shadow(struct amdgpu_bo *shadow, 335 335 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, 337 337 uint32_t domain); 338 338 339 339 /*
+1 -1
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
··· 926 926 bp.size = amdgpu_vm_bo_size(adev, level); 927 927 bp.byte_align = AMDGPU_GPU_PAGE_SIZE; 928 928 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); 930 930 bp.flags = AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS | 931 931 AMDGPU_GEM_CREATE_CPU_GTT_USWC; 932 932