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

Commit 14fd833e authored by Chunming Zhou's avatar Chunming Zhou Committed by Alex Deucher
Browse files

drm/amdgpu: validate shadow as well when validating bo 



Signed-off-by: default avatarChunming Zhou <David1.Zhou@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent e7893c4b

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

+46 −30
Original line number Diff line number Diff line
@@ -287,34 +287,15 @@ static u64 amdgpu_cs_get_threshold_for_moves(struct amdgpu_device *adev) 
	return max(bytes_moved_threshold, 1024*1024ull);

}



int amdgpu_cs_list_validate(struct amdgpu_cs_parser *p,

			    struct list_head *validated)

static int amdgpu_cs_bo_validate(struct amdgpu_cs_parser *p,

				 struct amdgpu_bo *bo)

{

	struct amdgpu_bo_list_entry *lobj;

	u64 initial_bytes_moved;

	int r;



	list_for_each_entry(lobj, validated, tv.head) {

		struct amdgpu_bo *bo = lobj->robj;

		bool binding_userptr = false;

		struct mm_struct *usermm;

	uint32_t domain;



		usermm = amdgpu_ttm_tt_get_usermm(bo->tbo.ttm);

		if (usermm && usermm != current->mm)

			return -EPERM;



		/* Check if we have user pages and nobody bound the BO already */

		if (lobj->user_pages && bo->tbo.ttm->state != tt_bound) {

			size_t size = sizeof(struct page *);



			size *= bo->tbo.ttm->num_pages;

			memcpy(bo->tbo.ttm->pages, lobj->user_pages, size);

			binding_userptr = true;

		}

	int r;



	if (bo->pin_count)

			continue;

		return 0;



	/* Avoid moving this one if we have moved too many buffers

	 * for this IB already.
@@ -341,6 +322,41 @@ int amdgpu_cs_list_validate(struct amdgpu_cs_parser *p, 
			domain = bo->allowed_domains;

			goto retry;

		}

	}



	return r;

}



int amdgpu_cs_list_validate(struct amdgpu_cs_parser *p,

			    struct list_head *validated)

{

	struct amdgpu_bo_list_entry *lobj;

	int r;



	list_for_each_entry(lobj, validated, tv.head) {

		struct amdgpu_bo *bo = lobj->robj;

		bool binding_userptr = false;

		struct mm_struct *usermm;



		usermm = amdgpu_ttm_tt_get_usermm(bo->tbo.ttm);

		if (usermm && usermm != current->mm)

			return -EPERM;



		/* Check if we have user pages and nobody bound the BO already */

		if (lobj->user_pages && bo->tbo.ttm->state != tt_bound) {

			size_t size = sizeof(struct page *);



			size *= bo->tbo.ttm->num_pages;

			memcpy(bo->tbo.ttm->pages, lobj->user_pages, size);

			binding_userptr = true;

		}



		r = amdgpu_cs_bo_validate(p, bo);

		if (r)

			return r;

		if (bo->shadow) {

			r = amdgpu_cs_bo_validate(p, bo);

			if (r)

				return r;

		}