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

Commit 72d7668b authored Sep 03, 2015 by Christian König Committed by Alex Deucher Sep 23, 2015

drm/amdgpu: export reservation_object from dmabuf to ttm (v2)



Adds an extra argument to amdgpu_bo_create, which is only used in amdgpu_prime.c.

Port of radeon commit 831b6966.

v2: fix up kfd.

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Jammy Zhou <Jammy.Zhou@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>

parent b7d698d7

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -183,7 +183,7 @@ int alloc_gtt_mem(struct kgd_dev *kgd, size_t size,
	return -ENOMEM;		return -ENOMEM;

	r = amdgpu_bo_create(rdev, size, PAGE_SIZE, true, AMDGPU_GEM_DOMAIN_GTT,		r = amdgpu_bo_create(rdev, size, PAGE_SIZE, true, AMDGPU_GEM_DOMAIN_GTT,
	AMDGPU_GEM_CREATE_CPU_GTT_USWC, NULL, &(*mem)->bo);		AMDGPU_GEM_CREATE_CPU_GTT_USWC, NULL, NULL, &(*mem)->bo);
	if (r) {		if (r) {
	dev_err(rdev->dev,		dev_err(rdev->dev,
	"failed to allocate BO for amdkfd (%d)\n", r);		"failed to allocate BO for amdkfd (%d)\n", r);

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

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -79,7 +79,8 @@ static void amdgpu_benchmark_move(struct amdgpu_device *adev, unsigned size,
	int time;		int time;

	n = AMDGPU_BENCHMARK_ITERATIONS;		n = AMDGPU_BENCHMARK_ITERATIONS;
	r = amdgpu_bo_create(adev, size, PAGE_SIZE, true, sdomain, 0, NULL, &sobj);		r = amdgpu_bo_create(adev, size, PAGE_SIZE, true, sdomain, 0, NULL,
			NULL, &sobj);
	if (r) {		if (r) {
	goto out_cleanup;		goto out_cleanup;
	}		}
	@@ -91,7 +92,8 @@ static void amdgpu_benchmark_move(struct amdgpu_device *adev, unsigned size,
	if (r) {		if (r) {
	goto out_cleanup;		goto out_cleanup;
	}		}
	r = amdgpu_bo_create(adev, size, PAGE_SIZE, true, ddomain, 0, NULL, &dobj);		r = amdgpu_bo_create(adev, size, PAGE_SIZE, true, ddomain, 0, NULL,
			NULL, &dobj);
	if (r) {		if (r) {
	goto out_cleanup;		goto out_cleanup;
	}		}

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

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -86,7 +86,7 @@ static int amdgpu_cgs_gmap_kmem(void cgs_device, void kmem,

	struct sg_table *sg = drm_prime_pages_to_sg(&kmem_page, npages);		struct sg_table *sg = drm_prime_pages_to_sg(&kmem_page, npages);
	ret = amdgpu_bo_create(adev, size, PAGE_SIZE, false,		ret = amdgpu_bo_create(adev, size, PAGE_SIZE, false,
	AMDGPU_GEM_DOMAIN_GTT, 0, sg, &bo);		AMDGPU_GEM_DOMAIN_GTT, 0, sg, NULL, &bo);
	if (ret)		if (ret)
	return ret;		return ret;
	ret = amdgpu_bo_reserve(bo, false);		ret = amdgpu_bo_reserve(bo, false);
	@@ -197,7 +197,8 @@ static int amdgpu_cgs_alloc_gpu_mem(void *cgs_device,

	ret = amdgpu_bo_create_restricted(adev, size, PAGE_SIZE,		ret = amdgpu_bo_create_restricted(adev, size, PAGE_SIZE,
	true, domain, flags,		true, domain, flags,
	NULL, &placement, &obj);		NULL, &placement, NULL,
			&obj);
	if (ret) {		if (ret) {
	DRM_ERROR("(%d) bo create failed\n", ret);		DRM_ERROR("(%d) bo create failed\n", ret);
	return ret;		return ret;

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

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -246,7 +246,7 @@ static int amdgpu_vram_scratch_init(struct amdgpu_device *adev)
	r = amdgpu_bo_create(adev, AMDGPU_GPU_PAGE_SIZE,		r = amdgpu_bo_create(adev, AMDGPU_GPU_PAGE_SIZE,
	PAGE_SIZE, true, AMDGPU_GEM_DOMAIN_VRAM,		PAGE_SIZE, true, AMDGPU_GEM_DOMAIN_VRAM,
	AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED,		AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED,
	NULL, &adev->vram_scratch.robj);		NULL, NULL, &adev->vram_scratch.robj);
	if (r) {		if (r) {
	return r;		return r;
	}		}
	@@ -449,7 +449,8 @@ static int amdgpu_wb_init(struct amdgpu_device *adev)

	if (adev->wb.wb_obj == NULL) {		if (adev->wb.wb_obj == NULL) {
	r = amdgpu_bo_create(adev, AMDGPU_MAX_WB * 4, PAGE_SIZE, true,		r = amdgpu_bo_create(adev, AMDGPU_MAX_WB * 4, PAGE_SIZE, true,
	AMDGPU_GEM_DOMAIN_GTT, 0, NULL, &adev->wb.wb_obj);		AMDGPU_GEM_DOMAIN_GTT, 0, NULL, NULL,
			&adev->wb.wb_obj);
	if (r) {		if (r) {
	dev_warn(adev->dev, "(%d) create WB bo failed\n", r);		dev_warn(adev->dev, "(%d) create WB bo failed\n", r);
	return r;		return r;

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -127,7 +127,7 @@ int amdgpu_gart_table_vram_alloc(struct amdgpu_device *adev)
	r = amdgpu_bo_create(adev, adev->gart.table_size,		r = amdgpu_bo_create(adev, adev->gart.table_size,
	PAGE_SIZE, true, AMDGPU_GEM_DOMAIN_VRAM,		PAGE_SIZE, true, AMDGPU_GEM_DOMAIN_VRAM,
	AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED,		AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED,
	NULL, &adev->gart.robj);		NULL, NULL, &adev->gart.robj);
	if (r) {		if (r) {
	return r;		return r;
	}		}