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

Commit 7303b39e authored by Michel Dänzer's avatar Michel Dänzer Committed by Alex Deucher
Browse files

drm/amdgpu: Make amdgpu_vram_mgr_bo_invisible_size always accurate 



Even BOs with AMDGPU_GEM_CREATE_NO_CPU_ACCESS may end up at least
partially in CPU visible VRAM, in particular when all VRAM is visible.

v2:
* Don't take VRAM mgr spinlock, not needed (Christian König)
* Make loop logic simpler and clearer.

Cc: stable@vger.kernel.org
Signed-off-by: default avatarMichel Dänzer <michel.daenzer@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 5e9244ff

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

+18 −2
Original line number Diff line number Diff line
@@ -106,10 +106,26 @@ static u64 amdgpu_vram_mgr_vis_size(struct amdgpu_device *adev, 
 */

u64 amdgpu_vram_mgr_bo_invisible_size(struct amdgpu_bo *bo)

{

	if (bo->flags & AMDGPU_GEM_CREATE_NO_CPU_ACCESS)

		return amdgpu_bo_size(bo);

	struct amdgpu_device *adev = amdgpu_ttm_adev(bo->tbo.bdev);

	struct ttm_mem_reg *mem = &bo->tbo.mem;

	struct drm_mm_node *nodes = mem->mm_node;

	unsigned pages = mem->num_pages;

	u64 usage = 0;



	if (adev->gmc.visible_vram_size == adev->gmc.real_vram_size)

		return 0;



	if (mem->start >= adev->gmc.visible_vram_size >> PAGE_SHIFT)

		return amdgpu_bo_size(bo);



	while (nodes && pages) {

		usage += nodes->size << PAGE_SHIFT;

		usage -= amdgpu_vram_mgr_vis_size(adev, nodes);

		pages -= nodes->size;

		++nodes;

	}



	return usage;

}



/**