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

Commit 82521316 authored by Roger.He's avatar Roger.He Committed by Alex Deucher
Browse files

drm/amdgpu: validate shadow before restoring from it 



Reviewed-by: default avatarChunming Zhou <david1.zhou@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarRoger.He <Hongbo.He@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 4a9ed100

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

+12 −0
Original line number Diff line number Diff line
@@ -2429,6 +2429,18 @@ static int amdgpu_recover_vram_from_shadow(struct amdgpu_device *adev, 
	domain = amdgpu_mem_type_to_domain(bo->tbo.mem.mem_type);

	/* if bo has been evicted, then no need to recover */

	if (domain == AMDGPU_GEM_DOMAIN_VRAM) {

		r = amdgpu_bo_validate(bo->shadow);

		if (r) {

			DRM_ERROR("bo validate failed!\n");

			goto err;

		}



		r = amdgpu_ttm_bind(&bo->shadow->tbo, &bo->shadow->tbo.mem);

		if (r) {

			DRM_ERROR("%p bind failed\n", bo->shadow);

			goto err;

		}



		r = amdgpu_bo_restore_from_shadow(adev, ring, bo,

						 NULL, fence, true);

		if (r) {

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

+21 −0
Original line number Diff line number Diff line
@@ -543,6 +543,27 @@ int amdgpu_bo_backup_to_shadow(struct amdgpu_device *adev, 
	return r;

}



int amdgpu_bo_validate(struct amdgpu_bo *bo)

{

	uint32_t domain;

	int r;



	if (bo->pin_count)

		return 0;



	domain = bo->prefered_domains;



retry:

	amdgpu_ttm_placement_from_domain(bo, domain);

	r = ttm_bo_validate(&bo->tbo, &bo->placement, false, false);

	if (unlikely(r == -ENOMEM) && domain != bo->allowed_domains) {

		domain = bo->allowed_domains;

		goto retry;

	}



	return r;

}



int amdgpu_bo_restore_from_shadow(struct amdgpu_device *adev,

				  struct amdgpu_ring *ring,

				  struct amdgpu_bo *bo,

drivers/gpu/drm/amd/amdgpu/amdgpu_object.h

+1 −0
Original line number Diff line number Diff line
@@ -175,6 +175,7 @@ int amdgpu_bo_backup_to_shadow(struct amdgpu_device *adev, 
			       struct amdgpu_bo *bo,

			       struct reservation_object *resv,

			       struct dma_fence **fence, bool direct);

int amdgpu_bo_validate(struct amdgpu_bo *bo);

int amdgpu_bo_restore_from_shadow(struct amdgpu_device *adev,

				  struct amdgpu_ring *ring,

				  struct amdgpu_bo *bo,