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

drm/ttm: allow reserving more than one shared slot v3 



Let's support simultaneous submissions to multiple engines.

v2: rename the field to num_shared and fix up all users
v3: rebased

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarMichel Dänzer <michel.daenzer@amd.com>
Reviewed-by: default avatarJunwei Zhang <Jerry.Zhang@amd.com>
Reviewed-by: default avatarHuang Rui <ray.huang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent c50fe0c5

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

+5 −5
Original line number Diff line number Diff line
@@ -535,7 +535,7 @@ static void add_kgd_mem_to_kfd_bo_list(struct kgd_mem *mem, 
	struct amdgpu_bo *bo = mem->bo;



	INIT_LIST_HEAD(&entry->head);

	entry->shared = true;

	entry->num_shared = 1;

	entry->bo = &bo->tbo;

	mutex_lock(&process_info->lock);

	if (userptr)
@@ -676,7 +676,7 @@ static int reserve_bo_and_vm(struct kgd_mem *mem, 


	ctx->kfd_bo.priority = 0;

	ctx->kfd_bo.tv.bo = &bo->tbo;

	ctx->kfd_bo.tv.shared = true;

	ctx->kfd_bo.tv.num_shared = 1;

	ctx->kfd_bo.user_pages = NULL;

	list_add(&ctx->kfd_bo.tv.head, &ctx->list);
@@ -740,7 +740,7 @@ static int reserve_bo_and_cond_vms(struct kgd_mem *mem, 


	ctx->kfd_bo.priority = 0;

	ctx->kfd_bo.tv.bo = &bo->tbo;

	ctx->kfd_bo.tv.shared = true;

	ctx->kfd_bo.tv.num_shared = 1;

	ctx->kfd_bo.user_pages = NULL;

	list_add(&ctx->kfd_bo.tv.head, &ctx->list);
@@ -1830,7 +1830,7 @@ static int validate_invalid_user_pages(struct amdkfd_process_info *process_info) 
			    validate_list.head) {

		list_add_tail(&mem->resv_list.head, &resv_list);

		mem->resv_list.bo = mem->validate_list.bo;

		mem->resv_list.shared = mem->validate_list.shared;

		mem->resv_list.num_shared = mem->validate_list.num_shared;

	}



	/* Reserve all BOs and page tables for validation */
@@ -2049,7 +2049,7 @@ int amdgpu_amdkfd_gpuvm_restore_process_bos(void *info, struct dma_fence **ef) 


		list_add_tail(&mem->resv_list.head, &ctx.list);

		mem->resv_list.bo = mem->validate_list.bo;

		mem->resv_list.shared = mem->validate_list.shared;

		mem->resv_list.num_shared = mem->validate_list.num_shared;

	}



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

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

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ int amdgpu_bo_list_create(struct amdgpu_device *adev, struct drm_file *filp, 
		entry->priority = min(info[i].bo_priority,

				      AMDGPU_BO_LIST_MAX_PRIORITY);

		entry->tv.bo = &bo->tbo;

		entry->tv.shared = !bo->prime_shared_count;

		entry->tv.num_shared = !bo->prime_shared_count;



		if (bo->preferred_domains == AMDGPU_GEM_DOMAIN_GDS)

			list->gds_obj = bo;

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

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ static int amdgpu_cs_user_fence_chunk(struct amdgpu_cs_parser *p, 
	bo = amdgpu_bo_ref(gem_to_amdgpu_bo(gobj));

	p->uf_entry.priority = 0;

	p->uf_entry.tv.bo = &bo->tbo;

	p->uf_entry.tv.shared = true;

	p->uf_entry.tv.num_shared = 1;

	p->uf_entry.user_pages = NULL;



	drm_gem_object_put_unlocked(gobj);

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

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ int amdgpu_map_static_csa(struct amdgpu_device *adev, struct amdgpu_vm *vm, 
	INIT_LIST_HEAD(&list);

	INIT_LIST_HEAD(&csa_tv.head);

	csa_tv.bo = &bo->tbo;

	csa_tv.shared = true;

	csa_tv.num_shared = 1;



	list_add(&csa_tv.head, &list);

	amdgpu_vm_get_pd_bo(vm, &list, &pd);

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

+5 −2
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ void amdgpu_gem_object_close(struct drm_gem_object *obj, 
	INIT_LIST_HEAD(&duplicates);



	tv.bo = &bo->tbo;

	tv.shared = true;

	tv.num_shared = 1;

	list_add(&tv.head, &list);



	amdgpu_vm_get_pd_bo(vm, &list, &vm_pd);
@@ -604,7 +604,10 @@ int amdgpu_gem_va_ioctl(struct drm_device *dev, void *data, 
			return -ENOENT;

		abo = gem_to_amdgpu_bo(gobj);

		tv.bo = &abo->tbo;

		tv.shared = !!(abo->flags & AMDGPU_GEM_CREATE_VM_ALWAYS_VALID);

		if (abo->flags & AMDGPU_GEM_CREATE_VM_ALWAYS_VALID)

			tv.num_shared = 1;

		else

			tv.num_shared = 0;

		list_add(&tv.head, &list);

	} else {

		gobj = NULL;

CRA Git | Maintained and supported by SUSTech CRA and CCSE