Commit 6e58ab7a authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/ttm: Make LRU removal optional v2 



We are already doing this for DMA-buf imports and also for
amdgpu VM BOs for quite a while now.

If this doesn't run into any problems we are probably going
to stop removing BOs from the LRU altogether.

v2: drop BUG_ON from ttm_bo_add_to_lru

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarChunming Zhou <david1.zhou@amd.com>
Tested-by: default avatarPierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 526c654a

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

+5 −4
Original line number Diff line number Diff line
@@ -585,7 +585,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);

				     false, &ctx->duplicates, true);

	if (!ret)

		ctx->reserved = true;

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



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

				     false, &ctx->duplicates);

				     false, &ctx->duplicates, true);

	if (!ret)

		ctx->reserved = true;

	else
@@ -1808,7 +1808,8 @@ 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);

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

				     true);

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

	if (ret)

		goto out_free;
@@ -2014,7 +2015,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);

				     false, &duplicate_save, true);

	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
@@ -648,7 +648,7 @@ static int amdgpu_cs_parser_bos(struct amdgpu_cs_parser *p, 
	}



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

				   &duplicates);

				   &duplicates, true);

	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
@@ -79,7 +79,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);

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

	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
@@ -171,7 +171,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);

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

	if (r) {

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

			"we fail to reserve bo (%d)\n", r);
@@ -608,7 +608,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);

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

	if (r)

		goto error_unref;

drivers/gpu/drm/qxl/qxl_release.c

+1 −1
Original line number Diff line number Diff line
@@ -256,7 +256,7 @@ int qxl_release_reserve_list(struct qxl_release *release, bool no_intr) 
		return 0;



	ret = ttm_eu_reserve_buffers(&release->ticket, &release->bos,

				     !no_intr, NULL);

				     !no_intr, NULL, true);

	if (ret)

		return ret;

CRA Git | Maintained and supported by SUSTech CRA and CCSE