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

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

drm/amdgpu: validate duplicates in the CS as well 



This allows for multiple BOs to have the same reservation object.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarJammy Zhou <Jammy.Zhou@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 72d7668b

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

+20 −14
Original line number Original line Diff line number Diff line
@@ -321,25 +321,17 @@ static u64 amdgpu_cs_get_threshold_for_moves(struct amdgpu_device *adev) 
	return max(bytes_moved_threshold, 1024*1024ull);

	return max(bytes_moved_threshold, 1024*1024ull);

}

}





int amdgpu_cs_list_validate(struct amdgpu_cs_parser *p)

int amdgpu_cs_list_validate(struct amdgpu_device *adev,

			    struct amdgpu_vm *vm,

			    struct list_head *validated)

{

{

	struct amdgpu_fpriv *fpriv = p->filp->driver_priv;

	struct amdgpu_vm *vm = &fpriv->vm;

	struct amdgpu_device *adev = p->adev;

	struct amdgpu_bo_list_entry *lobj;

	struct amdgpu_bo_list_entry *lobj;

	struct list_head duplicates;

	struct amdgpu_bo *bo;

	struct amdgpu_bo *bo;

	u64 bytes_moved = 0, initial_bytes_moved;

	u64 bytes_moved = 0, initial_bytes_moved;

	u64 bytes_moved_threshold = amdgpu_cs_get_threshold_for_moves(adev);

	u64 bytes_moved_threshold = amdgpu_cs_get_threshold_for_moves(adev);

	int r;

	int r;





	INIT_LIST_HEAD(&duplicates);

	list_for_each_entry(lobj, validated, tv.head) {

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

	if (unlikely(r != 0)) {

		return r;

	}



	list_for_each_entry(lobj, &p->validated, tv.head) {

		bo = lobj->robj;

		bo = lobj->robj;

		if (!bo->pin_count) {

		if (!bo->pin_count) {

			u32 domain = lobj->prefered_domains;

			u32 domain = lobj->prefered_domains;
@@ -373,7 +365,6 @@ int amdgpu_cs_list_validate(struct amdgpu_cs_parser *p) 
					domain = lobj->allowed_domains;

					domain = lobj->allowed_domains;

					goto retry;

					goto retry;

				}

				}

				ttm_eu_backoff_reservation(&p->ticket, &p->validated);

				return r;

				return r;

			}

			}

		}

		}
@@ -386,6 +377,7 @@ static int amdgpu_cs_parser_relocs(struct amdgpu_cs_parser *p) 
{

{

	struct amdgpu_fpriv *fpriv = p->filp->driver_priv;

	struct amdgpu_fpriv *fpriv = p->filp->driver_priv;

	struct amdgpu_cs_buckets buckets;

	struct amdgpu_cs_buckets buckets;

	struct list_head duplicates;

	bool need_mmap_lock = false;

	bool need_mmap_lock = false;

	int i, r;

	int i, r;
@@ -405,8 +397,22 @@ static int amdgpu_cs_parser_relocs(struct amdgpu_cs_parser *p) 
	if (need_mmap_lock)

	if (need_mmap_lock)

		down_read(&current->mm->mmap_sem);

		down_read(&current->mm->mmap_sem);





	r = amdgpu_cs_list_validate(p);

	INIT_LIST_HEAD(&duplicates);

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

	if (unlikely(r != 0))

		goto error_reserve;



	r = amdgpu_cs_list_validate(p->adev, &fpriv->vm, &p->validated);

	if (r)

		goto error_validate;



	r = amdgpu_cs_list_validate(p->adev, &fpriv->vm, &duplicates);



error_validate:

	if (r)

		ttm_eu_backoff_reservation(&p->ticket, &p->validated);





error_reserve:

	if (need_mmap_lock)

	if (need_mmap_lock)

		up_read(&current->mm->mmap_sem);

		up_read(&current->mm->mmap_sem);