Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3216c6b7 authored by Chunming Zhou's avatar Chunming Zhou Committed by Alex Deucher
Browse files

drm/amdgpu: use amdgpu_bo_param for amdgpu_bo_create v2 



After that, we can easily add new parameter when need.

v2:
a) rebase.
b) Initialize struct amdgpu_bo_param, future new
member could only be used in some one case, but all member
should have its own initial value.

Signed-off-by: default avatarChunming Zhou <david1.zhou@amd.com>
Reviewed-by: Huang Rui <ray.huang@amd.com> (v1)
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarJunwei Zhang <Jerry.Zhang@amd.com>
Cc: christian.koenig@amd.com
Cc: Felix.Kuehling@amd.com
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent a906dbb1

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

+9 −3
Original line number Diff line number Diff line
@@ -217,13 +217,19 @@ int alloc_gtt_mem(struct kgd_dev *kgd, size_t size, 
{

	struct amdgpu_device *adev = (struct amdgpu_device *)kgd;

	struct amdgpu_bo *bo = NULL;

	struct amdgpu_bo_param bp;

	int r;

	uint64_t gpu_addr_tmp = 0;

	void *cpu_ptr_tmp = NULL;



	r = amdgpu_bo_create(adev, size, PAGE_SIZE, AMDGPU_GEM_DOMAIN_GTT,

			     AMDGPU_GEM_CREATE_CPU_GTT_USWC, ttm_bo_type_kernel,

			     NULL, &bo);

	memset(&bp, 0, sizeof(bp));

	bp.size = size;

	bp.byte_align = PAGE_SIZE;

	bp.domain = AMDGPU_GEM_DOMAIN_GTT;

	bp.flags = AMDGPU_GEM_CREATE_CPU_GTT_USWC;

	bp.type = ttm_bo_type_kernel;

	bp.resv = NULL;

	r = amdgpu_bo_create(adev, &bp, &bo);

	if (r) {

		dev_err(adev->dev,

			"failed to allocate BO for amdkfd (%d)\n", r);

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

+9 −2
Original line number Diff line number Diff line
@@ -1004,6 +1004,7 @@ int amdgpu_amdkfd_gpuvm_alloc_memory_of_gpu( 
	struct amdgpu_device *adev = get_amdgpu_device(kgd);

	struct amdgpu_vm *avm = (struct amdgpu_vm *)vm;

	struct amdgpu_bo *bo;

	struct amdgpu_bo_param bp;

	int byte_align;

	u32 alloc_domain;

	u64 alloc_flags;
@@ -1069,8 +1070,14 @@ int amdgpu_amdkfd_gpuvm_alloc_memory_of_gpu( 
	pr_debug("\tcreate BO VA 0x%llx size 0x%llx domain %s\n",

			va, size, domain_string(alloc_domain));



	ret = amdgpu_bo_create(adev, size, byte_align,

				alloc_domain, alloc_flags, ttm_bo_type_device, NULL, &bo);

	memset(&bp, 0, sizeof(bp));

	bp.size = size;

	bp.byte_align = byte_align;

	bp.domain = alloc_domain;

	bp.flags = alloc_flags;

	bp.type = ttm_bo_type_device;

	bp.resv = NULL;

	ret = amdgpu_bo_create(adev, &bp, &bo);

	if (ret) {

		pr_debug("Failed to create BO on domain %s. ret %d\n",

				domain_string(alloc_domain), ret);

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

+11 −4
Original line number Diff line number Diff line
@@ -75,13 +75,20 @@ static void amdgpu_benchmark_move(struct amdgpu_device *adev, unsigned size, 
{

	struct amdgpu_bo *dobj = NULL;

	struct amdgpu_bo *sobj = NULL;

	struct amdgpu_bo_param bp;

	uint64_t saddr, daddr;

	int r, n;

	int time;



	memset(&bp, 0, sizeof(bp));

	bp.size = size;

	bp.byte_align = PAGE_SIZE;

	bp.domain = sdomain;

	bp.flags = 0;

	bp.type = ttm_bo_type_kernel;

	bp.resv = NULL;

	n = AMDGPU_BENCHMARK_ITERATIONS;

	r = amdgpu_bo_create(adev, size, PAGE_SIZE,sdomain, 0,

			     ttm_bo_type_kernel, NULL, &sobj);

	r = amdgpu_bo_create(adev, &bp, &sobj);

	if (r) {

		goto out_cleanup;

	}
@@ -93,8 +100,8 @@ static void amdgpu_benchmark_move(struct amdgpu_device *adev, unsigned size, 
	if (r) {

		goto out_cleanup;

	}

	r = amdgpu_bo_create(adev, size, PAGE_SIZE, ddomain, 0,

			     ttm_bo_type_kernel, NULL, &dobj);

	bp.domain = ddomain;

	r = amdgpu_bo_create(adev, &bp, &dobj);

	if (r) {

		goto out_cleanup;

	}

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

+11 −6
Original line number Diff line number Diff line
@@ -113,12 +113,17 @@ int amdgpu_gart_table_vram_alloc(struct amdgpu_device *adev) 
	int r;



	if (adev->gart.robj == NULL) {

		r = amdgpu_bo_create(adev, adev->gart.table_size, PAGE_SIZE,

				     AMDGPU_GEM_DOMAIN_VRAM,

				     AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED |

				     AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS,

				     ttm_bo_type_kernel, NULL,

				     &adev->gart.robj);

		struct amdgpu_bo_param bp;



		memset(&bp, 0, sizeof(bp));

		bp.size = adev->gart.table_size;

		bp.byte_align = PAGE_SIZE;

		bp.domain = AMDGPU_GEM_DOMAIN_VRAM;

		bp.flags = AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED |

			AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS;

		bp.type = ttm_bo_type_kernel;

		bp.resv = NULL;

		r = amdgpu_bo_create(adev, &bp, &adev->gart.robj);

		if (r) {

			return r;

		}

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

+9 −2
Original line number Diff line number Diff line
@@ -48,17 +48,24 @@ int amdgpu_gem_object_create(struct amdgpu_device *adev, unsigned long size, 
			     struct drm_gem_object **obj)

{

	struct amdgpu_bo *bo;

	struct amdgpu_bo_param bp;

	int r;



	memset(&bp, 0, sizeof(bp));

	*obj = NULL;

	/* At least align on page size */

	if (alignment < PAGE_SIZE) {

		alignment = PAGE_SIZE;

	}



	bp.size = size;

	bp.byte_align = alignment;

	bp.type = type;

	bp.resv = resv;

retry:

	r = amdgpu_bo_create(adev, size, alignment, initial_domain,

			     flags, type, resv, &bo);

	bp.flags = flags;

	bp.domain = initial_domain;

	r = amdgpu_bo_create(adev, &bp, &bo);

	if (r) {

		if (r != -ERESTARTSYS) {

			if (flags & AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED) {