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

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

drm/amdgpu: add invisible pin size statistic 



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 7c0ecda1

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

+1 −0
Original line number Diff line number Diff line
@@ -2034,6 +2034,7 @@ struct amdgpu_device { 


	/* tracking pinned memory */

	u64 vram_pin_size;

	u64 invisible_pin_size;

	u64 gart_pin_size;



	/* amdkfd interface */

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

+1 −1
Original line number Diff line number Diff line
@@ -384,7 +384,7 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file 
		vram_gtt.vram_size = adev->mc.real_vram_size;

		vram_gtt.vram_size -= adev->vram_pin_size;

		vram_gtt.vram_cpu_accessible_size = adev->mc.visible_vram_size;

		vram_gtt.vram_cpu_accessible_size -= adev->vram_pin_size;

		vram_gtt.vram_cpu_accessible_size -= (adev->vram_pin_size - adev->invisible_pin_size);

		vram_gtt.gtt_size  = adev->mc.gtt_size;

		vram_gtt.gtt_size -= adev->gart_pin_size;

		return copy_to_user(out, &vram_gtt,

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

+8 −4
Original line number Diff line number Diff line
@@ -424,9 +424,11 @@ int amdgpu_bo_pin_restricted(struct amdgpu_bo *bo, u32 domain, 
		bo->pin_count = 1;

		if (gpu_addr != NULL)

			*gpu_addr = amdgpu_bo_gpu_offset(bo);

		if (domain == AMDGPU_GEM_DOMAIN_VRAM)

		if (domain == AMDGPU_GEM_DOMAIN_VRAM) {

			bo->adev->vram_pin_size += amdgpu_bo_size(bo);

		else

			if (bo->flags & AMDGPU_GEM_CREATE_NO_CPU_ACCESS)

				bo->adev->invisible_pin_size += amdgpu_bo_size(bo);

		} else

			bo->adev->gart_pin_size += amdgpu_bo_size(bo);

	} else {

		dev_err(bo->adev->dev, "%p pin failed\n", bo);
@@ -456,9 +458,11 @@ int amdgpu_bo_unpin(struct amdgpu_bo *bo) 
	}

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

	if (likely(r == 0)) {

		if (bo->tbo.mem.mem_type == TTM_PL_VRAM)

		if (bo->tbo.mem.mem_type == TTM_PL_VRAM) {

			bo->adev->vram_pin_size -= amdgpu_bo_size(bo);

		else

			if (bo->flags & AMDGPU_GEM_CREATE_NO_CPU_ACCESS)

				bo->adev->invisible_pin_size -= amdgpu_bo_size(bo);

		} else

			bo->adev->gart_pin_size -= amdgpu_bo_size(bo);

	} else {

		dev_err(bo->adev->dev, "%p validate failed for unpin\n", bo);