Commit 3273f116 authored by Luben Tuikov's avatar Luben Tuikov Committed by Alex Deucher
Browse files

drm/amdgpu: Remove unnecessary domain argument 



Remove the "domain" argument to amdgpu_bo_create_kernel_at() since this
function takes an "offset" argument which is the offset off of VRAM, and as
such allocation always takes place in VRAM. Thus, the "domain" argument is
unnecessary.

Cc: Alex Deucher <Alexander.Deucher@amd.com>
Cc: Christian König <christian.koenig@amd.com>
Cc: AMD Graphics <amd-gfx@lists.freedesktop.org>
Signed-off-by: default avatarLuben Tuikov <luben.tuikov@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 7554886d

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

+5 −5
Original line number Diff line number Diff line
@@ -346,17 +346,16 @@ int amdgpu_bo_create_kernel(struct amdgpu_device *adev, 
 * @adev: amdgpu device object

 * @offset: offset of the BO

 * @size: size of the BO

 * @domain: where to place it

 * @bo_ptr:  used to initialize BOs in structures

 * @cpu_addr: optional CPU address mapping

 *

 * Creates a kernel BO at a specific offset in the address space of the domain.

 * Creates a kernel BO at a specific offset in VRAM.

 *

 * Returns:

 * 0 on success, negative error code otherwise.

 */

int amdgpu_bo_create_kernel_at(struct amdgpu_device *adev,

			       uint64_t offset, uint64_t size, uint32_t domain,

			       uint64_t offset, uint64_t size,

			       struct amdgpu_bo **bo_ptr, void **cpu_addr)

{

	struct ttm_operation_ctx ctx = { false, false };
@@ -366,8 +365,9 @@ int amdgpu_bo_create_kernel_at(struct amdgpu_device *adev, 
	offset &= PAGE_MASK;

	size = ALIGN(size, PAGE_SIZE);



	r = amdgpu_bo_create_reserved(adev, size, PAGE_SIZE, domain, bo_ptr,

				      NULL, cpu_addr);

	r = amdgpu_bo_create_reserved(adev, size, PAGE_SIZE,

				      AMDGPU_GEM_DOMAIN_VRAM, bo_ptr, NULL,

				      cpu_addr);

	if (r)

		return r;

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

+1 −1
Original line number Diff line number Diff line
@@ -284,7 +284,7 @@ int amdgpu_bo_create_kernel(struct amdgpu_device *adev, 
			    u32 domain, struct amdgpu_bo **bo_ptr,

			    u64 *gpu_addr, void **cpu_addr);

int amdgpu_bo_create_kernel_at(struct amdgpu_device *adev,

			       uint64_t offset, uint64_t size, uint32_t domain,

			       uint64_t offset, uint64_t size,

			       struct amdgpu_bo **bo_ptr, void **cpu_addr);

int amdgpu_bo_create_user(struct amdgpu_device *adev,

			  struct amdgpu_bo_param *bp,

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

+0 −7
Original line number Diff line number Diff line
@@ -1576,7 +1576,6 @@ static int amdgpu_ttm_fw_reserve_vram_init(struct amdgpu_device *adev) 
	return amdgpu_bo_create_kernel_at(adev,

					  adev->mman.fw_vram_usage_start_offset,

					  adev->mman.fw_vram_usage_size,

					  AMDGPU_GEM_DOMAIN_VRAM,

					  &adev->mman.fw_vram_usage_reserved_bo,

					  &adev->mman.fw_vram_usage_va);

}
@@ -1602,7 +1601,6 @@ static int amdgpu_ttm_drv_reserve_vram_init(struct amdgpu_device *adev) 
	return amdgpu_bo_create_kernel_at(adev,

					  adev->mman.drv_vram_usage_start_offset,

					  adev->mman.drv_vram_usage_size,

					  AMDGPU_GEM_DOMAIN_VRAM,

					  &adev->mman.drv_vram_usage_reserved_bo,

					  &adev->mman.drv_vram_usage_va);

}
@@ -1683,7 +1681,6 @@ static int amdgpu_ttm_reserve_tmr(struct amdgpu_device *adev) 
		ret = amdgpu_bo_create_kernel_at(adev,

					 ctx->c2p_train_data_offset,

					 ctx->train_data_size,

					 AMDGPU_GEM_DOMAIN_VRAM,

					 &ctx->c2p_bo,

					 NULL);

		if (ret) {
@@ -1697,7 +1694,6 @@ static int amdgpu_ttm_reserve_tmr(struct amdgpu_device *adev) 
	ret = amdgpu_bo_create_kernel_at(adev,

				adev->gmc.real_vram_size - adev->mman.discovery_tmr_size,

				adev->mman.discovery_tmr_size,

				AMDGPU_GEM_DOMAIN_VRAM,

				&adev->mman.discovery_memory,

				NULL);

	if (ret) {
@@ -1798,21 +1794,18 @@ int amdgpu_ttm_init(struct amdgpu_device *adev) 
	 * avoid display artifacts while transitioning between pre-OS

	 * and driver.  */

	r = amdgpu_bo_create_kernel_at(adev, 0, adev->mman.stolen_vga_size,

				       AMDGPU_GEM_DOMAIN_VRAM,

				       &adev->mman.stolen_vga_memory,

				       NULL);

	if (r)

		return r;

	r = amdgpu_bo_create_kernel_at(adev, adev->mman.stolen_vga_size,

				       adev->mman.stolen_extended_size,

				       AMDGPU_GEM_DOMAIN_VRAM,

				       &adev->mman.stolen_extended_memory,

				       NULL);

	if (r)

		return r;

	r = amdgpu_bo_create_kernel_at(adev, adev->mman.stolen_reserved_offset,

				       adev->mman.stolen_reserved_size,

				       AMDGPU_GEM_DOMAIN_VRAM,

				       &adev->mman.stolen_reserved_memory,

				       NULL);

	if (r)

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

+0 −1
Original line number Diff line number Diff line
@@ -395,7 +395,6 @@ static void amdgpu_virt_ras_reserve_bps(struct amdgpu_device *adev) 
		 */

		if (amdgpu_bo_create_kernel_at(adev, bp << AMDGPU_GPU_PAGE_SHIFT,

					       AMDGPU_GPU_PAGE_SIZE,

					       AMDGPU_GEM_DOMAIN_VRAM,

					       &bo, NULL))

			DRM_DEBUG("RAS WARN: reserve vram for retired page %llx fail\n", bp);