Commit f07069da authored by Christian König's avatar Christian König
Browse files

drm/ttm: move memory accounting into vmwgfx v4 



This is just another feature which is only used by VMWGFX, so move
it into the driver instead.

I've tried to add the accounting sysfs file to the kobject of the drm
minor, but I'm not 100% sure if this works as expected.

v2: fix typo in KFD and avoid 64bit divide
v3: fix init order in VMWGFX
v4: use pdev sysfs reference instead of drm

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: Zack Rusin <zackr@vmware.com> (v3)
Tested-by: default avatarNirmoy Das <nirmoy.das@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210208133226.36955-2-christian.koenig@amd.com
parent d4bd7776

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

+12 −4
Original line number Diff line number Diff line
@@ -118,6 +118,16 @@ void amdgpu_amdkfd_gpuvm_init_mem_limits(void) 
 */

#define ESTIMATE_PT_SIZE(mem_size) ((mem_size) >> 14)



static size_t amdgpu_amdkfd_acc_size(uint64_t size)

{

	size >>= PAGE_SHIFT;

	size *= sizeof(dma_addr_t) + sizeof(void *);



	return __roundup_pow_of_two(sizeof(struct amdgpu_bo)) +

		__roundup_pow_of_two(sizeof(struct ttm_tt)) +

		PAGE_ALIGN(size);

}



static int amdgpu_amdkfd_reserve_mem_limit(struct amdgpu_device *adev,

		uint64_t size, u32 domain, bool sg)

{
@@ -126,8 +136,7 @@ static int amdgpu_amdkfd_reserve_mem_limit(struct amdgpu_device *adev, 
	size_t acc_size, system_mem_needed, ttm_mem_needed, vram_needed;

	int ret = 0;



	acc_size = ttm_bo_dma_acc_size(&adev->mman.bdev, size,

				       sizeof(struct amdgpu_bo));

	acc_size = amdgpu_amdkfd_acc_size(size);



	vram_needed = 0;

	if (domain == AMDGPU_GEM_DOMAIN_GTT) {
@@ -174,8 +183,7 @@ static void unreserve_mem_limit(struct amdgpu_device *adev, 
{

	size_t acc_size;



	acc_size = ttm_bo_dma_acc_size(&adev->mman.bdev, size,

				       sizeof(struct amdgpu_bo));

	acc_size = amdgpu_amdkfd_acc_size(size);



	spin_lock(&kfd_mem_limit.mem_limit_lock);

	if (domain == AMDGPU_GEM_DOMAIN_GTT) {

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

+2 −6
Original line number Diff line number Diff line
@@ -523,7 +523,6 @@ static int amdgpu_bo_do_create(struct amdgpu_device *adev, 
	};

	struct amdgpu_bo *bo;

	unsigned long page_align, size = bp->size;

	size_t acc_size;

	int r;



	/* Note that GDS/GWS/OA allocates 1 page per byte/resource. */
@@ -546,9 +545,6 @@ static int amdgpu_bo_do_create(struct amdgpu_device *adev, 


	*bo_ptr = NULL;



	acc_size = ttm_bo_dma_acc_size(&adev->mman.bdev, size,

				       sizeof(struct amdgpu_bo));



	bo = kzalloc(sizeof(struct amdgpu_bo), GFP_KERNEL);

	if (bo == NULL)

		return -ENOMEM;
@@ -577,8 +573,8 @@ static int amdgpu_bo_do_create(struct amdgpu_device *adev, 
		bo->tbo.priority = 1;



	r = ttm_bo_init_reserved(&adev->mman.bdev, &bo->tbo, size, bp->type,

				 &bo->placement, page_align, &ctx, acc_size,

				 NULL, bp->resv, &amdgpu_bo_destroy);

				 &bo->placement, page_align, &ctx,  NULL,

				 bp->resv, &amdgpu_bo_destroy);

	if (unlikely(r != 0))

		return r;

drivers/gpu/drm/drm_gem_vram_helper.c

+2 −4
Original line number Diff line number Diff line
@@ -189,7 +189,6 @@ struct drm_gem_vram_object *drm_gem_vram_create(struct drm_device *dev, 
	struct drm_vram_mm *vmm = dev->vram_mm;

	struct ttm_device *bdev;

	int ret;

	size_t acc_size;



	if (WARN_ONCE(!vmm, "VRAM MM not initialized"))

		return ERR_PTR(-EINVAL);
@@ -216,7 +215,6 @@ struct drm_gem_vram_object *drm_gem_vram_create(struct drm_device *dev, 
	}



	bdev = &vmm->bdev;

	acc_size = ttm_bo_dma_acc_size(bdev, size, sizeof(*gbo));



	gbo->bo.bdev = bdev;

	drm_gem_vram_placement(gbo, DRM_GEM_VRAM_PL_FLAG_SYSTEM);
@@ -226,8 +224,8 @@ struct drm_gem_vram_object *drm_gem_vram_create(struct drm_device *dev, 
	 * to release gbo->bo.base and kfree gbo.

	 */

	ret = ttm_bo_init(bdev, &gbo->bo, size, ttm_bo_type_device,

			  &gbo->placement, pg_align, false, acc_size,

			  NULL, NULL, ttm_buffer_object_destroy);

			  &gbo->placement, pg_align, false, NULL, NULL,

			  ttm_buffer_object_destroy);

	if (ret)

		return ERR_PTR(ret);

drivers/gpu/drm/nouveau/nouveau_bo.c

+2 −5
Original line number Diff line number Diff line
@@ -300,18 +300,15 @@ nouveau_bo_init(struct nouveau_bo *nvbo, u64 size, int align, u32 domain, 
		struct sg_table *sg, struct dma_resv *robj)

{

	int type = sg ? ttm_bo_type_sg : ttm_bo_type_device;

	size_t acc_size;

	int ret;



	acc_size = ttm_bo_dma_acc_size(nvbo->bo.bdev, size, sizeof(*nvbo));



	nvbo->bo.mem.num_pages = size >> PAGE_SHIFT;

	nouveau_bo_placement_set(nvbo, domain, 0);

	INIT_LIST_HEAD(&nvbo->io_reserve_lru);



	ret = ttm_bo_init(nvbo->bo.bdev, &nvbo->bo, size, type,

			  &nvbo->placement, align >> PAGE_SHIFT, false,

			  acc_size, sg, robj, nouveau_bo_del_ttm);

			  &nvbo->placement, align >> PAGE_SHIFT, false, sg,

			  robj, nouveau_bo_del_ttm);

	if (ret) {

		/* ttm will call nouveau_bo_del_ttm if it fails.. */

		return ret;

drivers/gpu/drm/nouveau/nouveau_drv.h

+0 −1
Original line number Diff line number Diff line
@@ -54,7 +54,6 @@ 
#include <drm/ttm/ttm_bo_api.h>

#include <drm/ttm/ttm_bo_driver.h>

#include <drm/ttm/ttm_placement.h>

#include <drm/ttm/ttm_memory.h>



#include <drm/drm_audio_component.h>