Commit bb812f1e authored by Junwei Zhang's avatar Junwei Zhang Committed by Alex Deucher
Browse files

drm/amdgpu: allocate gart memory when it's required (v3) 



Instead of calling gart address space on every bo pin,
allocates it on demand

v2: fix error handling
v3: drop the change on amdgpu_amdkfd_gpuvm.c, not needed.

Signed-off-by: default avatarJunwei Zhang <Jerry.Zhang@amd.com>
Acked-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 7b7c6c81

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

+6 −0
Original line number Diff line number Diff line
@@ -280,6 +280,12 @@ int alloc_gtt_mem(struct kgd_dev *kgd, size_t size, 
		goto allocate_mem_pin_bo_failed;

	}



	r = amdgpu_ttm_alloc_gart(&bo->tbo);

	if (r) {

		dev_err(adev->dev, "%p bind failed\n", bo);

		goto allocate_mem_kmap_bo_failed;

	}



	r = amdgpu_bo_kmap(bo, &cpu_ptr_tmp);

	if (r) {

		dev_err(adev->dev,

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

+12 −2
Original line number Diff line number Diff line
@@ -96,11 +96,16 @@ static void amdgpu_benchmark_move(struct amdgpu_device *adev, unsigned size, 
	if (unlikely(r != 0))

		goto out_cleanup;

	r = amdgpu_bo_pin(sobj, sdomain);

	saddr = amdgpu_bo_gpu_offset(sobj);

	if (r) {

		amdgpu_bo_unreserve(sobj);

		goto out_cleanup;

	}

	r = amdgpu_ttm_alloc_gart(&sobj->tbo);

	amdgpu_bo_unreserve(sobj);

	if (r) {

		goto out_cleanup;

	}

	saddr = amdgpu_bo_gpu_offset(sobj);

	bp.domain = ddomain;

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

	if (r) {
@@ -110,11 +115,16 @@ static void amdgpu_benchmark_move(struct amdgpu_device *adev, unsigned size, 
	if (unlikely(r != 0))

		goto out_cleanup;

	r = amdgpu_bo_pin(dobj, ddomain);

	daddr = amdgpu_bo_gpu_offset(dobj);

	if (r) {

		amdgpu_bo_unreserve(sobj);

		goto out_cleanup;

	}

	r = amdgpu_ttm_alloc_gart(&dobj->tbo);

	amdgpu_bo_unreserve(dobj);

	if (r) {

		goto out_cleanup;

	}

	daddr = amdgpu_bo_gpu_offset(dobj);



	if (adev->mman.buffer_funcs) {

		time = amdgpu_benchmark_do_move(adev, size, saddr, daddr, n);

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

+6 −0
Original line number Diff line number Diff line
@@ -194,6 +194,12 @@ int amdgpu_display_crtc_page_flip_target(struct drm_crtc *crtc, 
		goto unreserve;

	}



	r = amdgpu_ttm_alloc_gart(&new_abo->tbo);

	if (unlikely(r != 0)) {

		DRM_ERROR("%p bind failed\n", new_abo);

		goto unpin;

	}



	r = reservation_object_get_fences_rcu(new_abo->tbo.resv, &work->excl,

					      &work->shared_count,

					      &work->shared);

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

+8 −0
Original line number Diff line number Diff line
@@ -173,6 +173,14 @@ static int amdgpufb_create_pinned_object(struct amdgpu_fbdev *rfbdev, 
		amdgpu_bo_unreserve(abo);

		goto out_unref;

	}



	ret = amdgpu_ttm_alloc_gart(&abo->tbo);

	if (ret) {

		amdgpu_bo_unreserve(abo);

		dev_err(adev->dev, "%p bind failed\n", abo);

		goto out_unref;

	}



	ret = amdgpu_bo_kmap(abo, NULL);

	amdgpu_bo_unreserve(abo);

	if (ret) {

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

+9 −6
Original line number Diff line number Diff line
@@ -257,6 +257,13 @@ int amdgpu_bo_create_reserved(struct amdgpu_device *adev, 
		dev_err(adev->dev, "(%d) kernel bo pin failed\n", r);

		goto error_unreserve;

	}



	r = amdgpu_ttm_alloc_gart(&(*bo_ptr)->tbo);

	if (r) {

		dev_err(adev->dev, "%p bind failed\n", *bo_ptr);

		goto error_unpin;

	}



	if (gpu_addr)

		*gpu_addr = amdgpu_bo_gpu_offset(*bo_ptr);
@@ -270,6 +277,8 @@ int amdgpu_bo_create_reserved(struct amdgpu_device *adev, 


	return 0;



error_unpin:

	amdgpu_bo_unpin(*bo_ptr);

error_unreserve:

	amdgpu_bo_unreserve(*bo_ptr);
@@ -903,12 +912,6 @@ int amdgpu_bo_pin_restricted(struct amdgpu_bo *bo, u32 domain, 
		goto error;

	}



	r = amdgpu_ttm_alloc_gart(&bo->tbo);

	if (unlikely(r)) {

		dev_err(adev->dev, "%p bind failed\n", bo);

		goto error;

	}



	bo->pin_count = 1;



	domain = amdgpu_mem_type_to_domain(bo->tbo.mem.mem_type);