Commit 3c848bb3 authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/amdgpu: move vram usage tracking into the vram manager v2 



Looks like a better place for this.

v2: use atomic64_t members instead

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

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

+0 −2
Original line number Diff line number Diff line
@@ -1482,8 +1482,6 @@ struct amdgpu_device { 
	struct amdgpu_mman		mman;

	struct amdgpu_vram_scratch	vram_scratch;

	struct amdgpu_wb		wb;

	atomic64_t			vram_usage;

	atomic64_t			vram_vis_usage;

	atomic64_t			num_bytes_moved;

	atomic64_t			num_evictions;

	atomic64_t			num_vram_cpu_page_faults;

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

+3 −2
Original line number Diff line number Diff line
@@ -246,7 +246,7 @@ static void amdgpu_cs_get_threshold_for_moves(struct amdgpu_device *adev, 
	}



	total_vram = adev->mc.real_vram_size - adev->vram_pin_size;

	used_vram = atomic64_read(&adev->vram_usage);

	used_vram = amdgpu_vram_mgr_usage(&adev->mman.bdev.man[TTM_PL_VRAM]);

	free_vram = used_vram >= total_vram ? 0 : total_vram - used_vram;



	spin_lock(&adev->mm_stats.lock);
@@ -292,7 +292,8 @@ static void amdgpu_cs_get_threshold_for_moves(struct amdgpu_device *adev, 
	/* Do the same for visible VRAM if half of it is free */

	if (adev->mc.visible_vram_size < adev->mc.real_vram_size) {

		u64 total_vis_vram = adev->mc.visible_vram_size;

		u64 used_vis_vram = atomic64_read(&adev->vram_vis_usage);

		u64 used_vis_vram =

			amdgpu_vram_mgr_vis_usage(&adev->mman.bdev.man[TTM_PL_VRAM]);



		if (used_vis_vram < total_vis_vram) {

			u64 free_vis_vram = total_vis_vram - used_vis_vram;

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

+5 −4
Original line number Diff line number Diff line
@@ -455,10 +455,10 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file 
		ui64 = atomic64_read(&adev->num_vram_cpu_page_faults);

		return copy_to_user(out, &ui64, min(size, 8u)) ? -EFAULT : 0;

	case AMDGPU_INFO_VRAM_USAGE:

		ui64 = atomic64_read(&adev->vram_usage);

		ui64 = amdgpu_vram_mgr_usage(&adev->mman.bdev.man[TTM_PL_VRAM]);

		return copy_to_user(out, &ui64, min(size, 8u)) ? -EFAULT : 0;

	case AMDGPU_INFO_VIS_VRAM_USAGE:

		ui64 = atomic64_read(&adev->vram_vis_usage);

		ui64 = amdgpu_vram_mgr_vis_usage(&adev->mman.bdev.man[TTM_PL_VRAM]);

		return copy_to_user(out, &ui64, min(size, 8u)) ? -EFAULT : 0;

	case AMDGPU_INFO_GTT_USAGE:

		ui64 = amdgpu_gtt_mgr_usage(&adev->mman.bdev.man[TTM_PL_TT]);
@@ -497,7 +497,8 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file 
		mem.vram.total_heap_size = adev->mc.real_vram_size;

		mem.vram.usable_heap_size =

			adev->mc.real_vram_size - adev->vram_pin_size;

		mem.vram.heap_usage = atomic64_read(&adev->vram_usage);

		mem.vram.heap_usage =

			amdgpu_vram_mgr_usage(&adev->mman.bdev.man[TTM_PL_VRAM]);

		mem.vram.max_allocation = mem.vram.usable_heap_size * 3 / 4;



		mem.cpu_accessible_vram.total_heap_size =
@@ -506,7 +507,7 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file 
			adev->mc.visible_vram_size -

			(adev->vram_pin_size - adev->invisible_pin_size);

		mem.cpu_accessible_vram.heap_usage =

			atomic64_read(&adev->vram_vis_usage);

			amdgpu_vram_mgr_vis_usage(&adev->mman.bdev.man[TTM_PL_VRAM]);

		mem.cpu_accessible_vram.max_allocation =

			mem.cpu_accessible_vram.usable_heap_size * 3 / 4;

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

+0 −50
Original line number Diff line number Diff line
@@ -37,53 +37,6 @@ 
#include "amdgpu.h"

#include "amdgpu_trace.h"







static u64 amdgpu_get_vis_part_size(struct amdgpu_device *adev,

						struct ttm_mem_reg *mem)

{

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

		return 0;



	return ((mem->start << PAGE_SHIFT) + mem->size) >

		adev->mc.visible_vram_size ?

		adev->mc.visible_vram_size - (mem->start << PAGE_SHIFT) :

		mem->size;

}



static void amdgpu_update_memory_usage(struct amdgpu_device *adev,

		       struct ttm_mem_reg *old_mem,

		       struct ttm_mem_reg *new_mem)

{

	u64 vis_size;

	if (!adev)

		return;



	if (new_mem) {

		switch (new_mem->mem_type) {

		case TTM_PL_TT:

			break;

		case TTM_PL_VRAM:

			atomic64_add(new_mem->size, &adev->vram_usage);

			vis_size = amdgpu_get_vis_part_size(adev, new_mem);

			atomic64_add(vis_size, &adev->vram_vis_usage);

			break;

		}

	}



	if (old_mem) {

		switch (old_mem->mem_type) {

		case TTM_PL_TT:

			break;

		case TTM_PL_VRAM:

			atomic64_sub(old_mem->size, &adev->vram_usage);

			vis_size = amdgpu_get_vis_part_size(adev, old_mem);

			atomic64_sub(vis_size, &adev->vram_vis_usage);

			break;

		}

	}

}



static void amdgpu_ttm_bo_destroy(struct ttm_buffer_object *tbo)

{

	struct amdgpu_device *adev = amdgpu_ttm_adev(tbo->bdev);
@@ -92,7 +45,6 @@ static void amdgpu_ttm_bo_destroy(struct ttm_buffer_object *tbo) 
	bo = container_of(tbo, struct amdgpu_bo, tbo);



	amdgpu_bo_kunmap(bo);

	amdgpu_update_memory_usage(adev, &bo->tbo.mem, NULL);



	drm_gem_object_release(&bo->gem_base);

	amdgpu_bo_unref(&bo->parent);
@@ -990,8 +942,6 @@ void amdgpu_bo_move_notify(struct ttm_buffer_object *bo, 
		return;



	/* move_notify is called before move happens */

	amdgpu_update_memory_usage(adev, &bo->mem, new_mem);



	trace_amdgpu_ttm_bo_move(abo, new_mem->mem_type, old_mem->mem_type);

}

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

+3 −0
Original line number Diff line number Diff line
@@ -68,6 +68,9 @@ int amdgpu_gtt_mgr_alloc(struct ttm_mem_type_manager *man, 
			 struct ttm_mem_reg *mem);

uint64_t amdgpu_gtt_mgr_usage(struct ttm_mem_type_manager *man);



uint64_t amdgpu_vram_mgr_usage(struct ttm_mem_type_manager *man);

uint64_t amdgpu_vram_mgr_vis_usage(struct ttm_mem_type_manager *man);



int amdgpu_copy_buffer(struct amdgpu_ring *ring, uint64_t src_offset,

		       uint64_t dst_offset, uint32_t byte_count,

		       struct reservation_object *resv,

CRA Git | Maintained and supported by SUSTech CRA and CCSE