Commit 8febe617 authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/amdgpu: revert "Add a parameter to amdgpu_bo_create()" 



This reverts commit 2046d46d.

Not needed any more.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 4c77edbf

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

+1 −2
Original line number Diff line number Diff line
@@ -216,8 +216,7 @@ int alloc_gtt_mem(struct kgd_dev *kgd, size_t size, 
		return -ENOMEM;



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

			     AMDGPU_GEM_CREATE_CPU_GTT_USWC, NULL, NULL, 0,

			     &(*mem)->bo);

			     AMDGPU_GEM_CREATE_CPU_GTT_USWC, NULL, NULL, &(*mem)->bo);

	if (r) {

		dev_err(adev->dev,

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

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

+2 −2
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ static void amdgpu_benchmark_move(struct amdgpu_device *adev, unsigned size, 


	n = AMDGPU_BENCHMARK_ITERATIONS;

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

			     NULL, 0, &sobj);

			     NULL, &sobj);

	if (r) {

		goto out_cleanup;

	}
@@ -94,7 +94,7 @@ static void amdgpu_benchmark_move(struct amdgpu_device *adev, unsigned size, 
		goto out_cleanup;

	}

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

			     NULL, 0, &dobj);

			     NULL, &dobj);

	if (r) {

		goto out_cleanup;

	}

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

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ static int amdgpu_cgs_alloc_gpu_mem(struct cgs_device *cgs_device, 
	*handle = 0;



	ret = amdgpu_bo_create(adev, size, align, true, domain, flags,

			       NULL, NULL, 0, &obj);

			       NULL, NULL, &obj);

	if (ret) {

		DRM_ERROR("(%d) bo create failed\n", ret);

		return ret;

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

+1 −1
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ int amdgpu_gart_table_vram_alloc(struct amdgpu_device *adev) 
				     PAGE_SIZE, true, AMDGPU_GEM_DOMAIN_VRAM,

				     AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED |

				     AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS,

				     NULL, NULL, 0, &adev->gart.robj);

				     NULL, NULL, &adev->gart.robj);

		if (r) {

			return r;

		}

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

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ int amdgpu_gem_object_create(struct amdgpu_device *adev, unsigned long size, 


retry:

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

			     flags, NULL, resv, 0, &bo);

			     flags, NULL, resv, &bo);

	if (r) {

		if (r != -ERESTARTSYS) {

			if (flags & AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE