Commit 9165fb87 authored by Christian König's avatar Christian König
Browse files

drm/ttm: always keep BOs on the LRU 



This allows blocking for BOs to become available
in the memory management.

Amdgpu is doing this for quite a while now during CS. Now
apply the new behavior to all drivers using TTM.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Acked-by: default avatarThomas Hellstrom <thellstrom@vmware.com>
Link: https://patchwork.freedesktop.org/patch/332878/
parent 7fb03cc3

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

+4 −5
Original line number Diff line number Diff line
@@ -586,7 +586,7 @@ static int reserve_bo_and_vm(struct kgd_mem *mem, 
	amdgpu_vm_get_pd_bo(vm, &ctx->list, &ctx->vm_pd[0]);



	ret = ttm_eu_reserve_buffers(&ctx->ticket, &ctx->list,

				     false, &ctx->duplicates, true);

				     false, &ctx->duplicates);

	if (!ret)

		ctx->reserved = true;

	else {
@@ -659,7 +659,7 @@ static int reserve_bo_and_cond_vms(struct kgd_mem *mem, 
	}



	ret = ttm_eu_reserve_buffers(&ctx->ticket, &ctx->list,

				     false, &ctx->duplicates, true);

				     false, &ctx->duplicates);

	if (!ret)

		ctx->reserved = true;

	else
@@ -1797,8 +1797,7 @@ static int validate_invalid_user_pages(struct amdkfd_process_info *process_info) 
	}



	/* Reserve all BOs and page tables for validation */

	ret = ttm_eu_reserve_buffers(&ticket, &resv_list, false, &duplicates,

				     true);

	ret = ttm_eu_reserve_buffers(&ticket, &resv_list, false, &duplicates);

	WARN(!list_empty(&duplicates), "Duplicates should be empty");

	if (ret)

		goto out_free;
@@ -1996,7 +1995,7 @@ int amdgpu_amdkfd_gpuvm_restore_process_bos(void *info, struct dma_fence **ef) 
	}



	ret = ttm_eu_reserve_buffers(&ctx.ticket, &ctx.list,

				     false, &duplicate_save, true);

				     false, &duplicate_save);

	if (ret) {

		pr_debug("Memory eviction: TTM Reserve Failed. Try again\n");

		goto ttm_reserve_fail;

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

+1 −1
Original line number Diff line number Diff line
@@ -650,7 +650,7 @@ static int amdgpu_cs_parser_bos(struct amdgpu_cs_parser *p, 
	}



	r = ttm_eu_reserve_buffers(&p->ticket, &p->validated, true,

				   &duplicates, false);

				   &duplicates);

	if (unlikely(r != 0)) {

		if (r != -ERESTARTSYS)

			DRM_ERROR("ttm_eu_reserve_buffers failed.\n");

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

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ int amdgpu_map_static_csa(struct amdgpu_device *adev, struct amdgpu_vm *vm, 
	list_add(&csa_tv.head, &list);

	amdgpu_vm_get_pd_bo(vm, &list, &pd);



	r = ttm_eu_reserve_buffers(&ticket, &list, true, NULL, false);

	r = ttm_eu_reserve_buffers(&ticket, &list, true, NULL);

	if (r) {

		DRM_ERROR("failed to reserve CSA,PD BOs: err=%d\n", r);

		return r;

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

+2 −2
Original line number Diff line number Diff line
@@ -175,7 +175,7 @@ void amdgpu_gem_object_close(struct drm_gem_object *obj, 


	amdgpu_vm_get_pd_bo(vm, &list, &vm_pd);



	r = ttm_eu_reserve_buffers(&ticket, &list, false, &duplicates, false);

	r = ttm_eu_reserve_buffers(&ticket, &list, false, &duplicates);

	if (r) {

		dev_err(adev->dev, "leaking bo va because "

			"we fail to reserve bo (%d)\n", r);
@@ -613,7 +613,7 @@ int amdgpu_gem_va_ioctl(struct drm_device *dev, void *data, 


	amdgpu_vm_get_pd_bo(&fpriv->vm, &list, &vm_pd);



	r = ttm_eu_reserve_buffers(&ticket, &list, true, &duplicates, false);

	r = ttm_eu_reserve_buffers(&ticket, &list, true, &duplicates);

	if (r)

		goto error_unref;

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

+1 −1
Original line number Diff line number Diff line
@@ -4494,7 +4494,7 @@ static int dm_plane_helper_prepare_fb(struct drm_plane *plane, 
	tv.num_shared = 1;

	list_add(&tv.head, &list);



	r = ttm_eu_reserve_buffers(&ticket, &list, false, NULL, true);

	r = ttm_eu_reserve_buffers(&ticket, &list, false, NULL);

	if (r) {

		dev_err(adev->dev, "fail to reserve bo (%d)\n", r);

		return r;

CRA Git | Maintained and supported by SUSTech CRA and CCSE