Commit fdee0872 authored by Yunxiang Li's avatar Yunxiang Li Committed by Alex Deucher
Browse files

drm/amdgpu: stop tracking visible memory stats 



Since on modern systems all of vram can be made visible anyways, to
simplify the new implementation, drops tracking how much memory is
visible for now. If this is really needed we can add it back on top of
the new implementation, or just report all the BOs as visible.

Signed-off-by: default avatarYunxiang Li <Yunxiang.Li@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarTvrtko Ursulin <tvrtko.ursulin@igalia.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent f2863650

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

+0 −6
Original line number Diff line number Diff line
@@ -103,16 +103,10 @@ void amdgpu_show_fdinfo(struct drm_printer *p, struct drm_file *file) 
		   stats[TTM_PL_SYSTEM].drm.resident/1024UL);



	/* Amdgpu specific memory accounting keys: */

	drm_printf(p, "amd-memory-visible-vram:\t%llu KiB\n",

		   stats[TTM_PL_VRAM].visible/1024UL);

	drm_printf(p, "amd-evicted-vram:\t%llu KiB\n",

		   stats[TTM_PL_VRAM].evicted/1024UL);

	drm_printf(p, "amd-evicted-visible-vram:\t%llu KiB\n",

		   stats[TTM_PL_VRAM].evicted_visible/1024UL);

	drm_printf(p, "amd-requested-vram:\t%llu KiB\n",

		   stats[TTM_PL_VRAM].requested/1024UL);

	drm_printf(p, "amd-requested-visible-vram:\t%llu KiB\n",

		   stats[TTM_PL_VRAM].requested_visible/1024UL);

	drm_printf(p, "amd-requested-gtt:\t%llu KiB\n",

		   stats[TTM_PL_TT].requested/1024UL);

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

+2 −10
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 
#include "amdgpu_trace.h"

#include "amdgpu_amdkfd.h"

#include "amdgpu_vram_mgr.h"

#include "amdgpu_vm.h"



/**

 * DOC: amdgpu_object
@@ -1236,23 +1237,14 @@ void amdgpu_bo_get_memory(struct amdgpu_bo *bo, 
			stats[type].drm.active += size;

		else if (bo->flags & AMDGPU_GEM_CREATE_DISCARDABLE)

			stats[type].drm.purgeable += size;



		if (type == TTM_PL_VRAM && amdgpu_res_cpu_visible(adev, res))

			stats[type].visible += size;

	}



	/* amdgpu specific stats: */



	if (bo->preferred_domains & AMDGPU_GEM_DOMAIN_VRAM) {

		stats[TTM_PL_VRAM].requested += size;

		if (bo->flags & AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED)

			stats[TTM_PL_VRAM].requested_visible += size;



		if (type != TTM_PL_VRAM) {

		if (type != TTM_PL_VRAM)

			stats[TTM_PL_VRAM].evicted += size;

			if (bo->flags & AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED)

				stats[TTM_PL_VRAM].evicted_visible += size;

		}

	} else if (bo->preferred_domains & AMDGPU_GEM_DOMAIN_GTT) {

		stats[TTM_PL_TT].requested += size;

	}

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

+0 −10
Original line number Diff line number Diff line
@@ -139,16 +139,6 @@ struct amdgpu_bo_vm { 
	struct amdgpu_vm_bo_base        entries[];

};



struct amdgpu_mem_stats {

	struct drm_memory_stats drm;



	uint64_t visible;

	uint64_t evicted;

	uint64_t evicted_visible;

	uint64_t requested;

	uint64_t requested_visible;

};



static inline struct amdgpu_bo *ttm_to_amdgpu_bo(struct ttm_buffer_object *tbo)

{

	return container_of(tbo, struct amdgpu_bo, tbo);

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

+10 −1
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ struct amdgpu_bo_va; 
struct amdgpu_job;

struct amdgpu_bo_list_entry;

struct amdgpu_bo_vm;

struct amdgpu_mem_stats;



/*

 * GPUVM handling
@@ -322,6 +321,16 @@ struct amdgpu_vm_fault_info { 
	unsigned int	vmhub;

};



struct amdgpu_mem_stats {

	struct drm_memory_stats drm;



	/* buffers that requested this placement */

	uint64_t requested;

	/* buffers that requested this placement

	 * but are currently evicted */

	uint64_t evicted;

};



struct amdgpu_vm {

	/* tree of virtual addresses mapped */

	struct rb_root_cached	va;