public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-08-05 16:54:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

drm/amdgpu: remove PL_PREEMPT accounting

Browse source 
This is provided by TTM now.

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220214093439.2989-7-christian.koenig@amd.com
This commit is contained in:
Christian König 2022-02-14 09:03:00 +01:00
parent dfa714b88e
commit 3fc2b087df
2 changed files with 6 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c
View file

@ -25,12 +25,6 @@
#include "amdgpu.h" #include "amdgpu.h"
static inline struct amdgpu_preempt_mgr *
to_preempt_mgr(struct ttm_resource_manager *man)
{
return container_of(man, struct amdgpu_preempt_mgr, manager);
}
/** /**
* DOC: mem_info_preempt_used * DOC: mem_info_preempt_used
* *
@ -45,10 +39,9 @@ static ssize_t mem_info_preempt_used_show(struct device *dev,
{ {
struct drm_device *ddev = dev_get_drvdata(dev); struct drm_device *ddev = dev_get_drvdata(dev);
struct amdgpu_device *adev = drm_to_adev(ddev); struct amdgpu_device *adev = drm_to_adev(ddev);
struct ttm_resource_manager *man; struct ttm_resource_manager *man = &adev->mman.preempt_mgr;
man = ttm_manager_type(&adev->mman.bdev, AMDGPU_PL_PREEMPT); return sysfs_emit(buf, "%llu\n", ttm_resource_manager_usage(man));
return sysfs_emit(buf, "%llu\n", amdgpu_preempt_mgr_usage(man));
} }
static DEVICE_ATTR_RO(mem_info_preempt_used); static DEVICE_ATTR_RO(mem_info_preempt_used);
@ -68,16 +61,12 @@ static int amdgpu_preempt_mgr_new(struct ttm_resource_manager *man,
const struct ttm_place *place, const struct ttm_place *place,
struct ttm_resource **res) struct ttm_resource **res)
{ {
struct amdgpu_preempt_mgr *mgr = to_preempt_mgr(man);
*res = kzalloc(sizeof(**res), GFP_KERNEL); *res = kzalloc(sizeof(**res), GFP_KERNEL);
if (!*res) if (!*res)
return -ENOMEM; return -ENOMEM;
ttm_resource_init(tbo, place, *res); ttm_resource_init(tbo, place, *res);
(*res)->start = AMDGPU_BO_INVALID_OFFSET; (*res)->start = AMDGPU_BO_INVALID_OFFSET;
atomic64_add((*res)->num_pages, &mgr->used);
return 0; return 0;
} }
@ -92,49 +81,13 @@ static int amdgpu_preempt_mgr_new(struct ttm_resource_manager *man,
static void amdgpu_preempt_mgr_del(struct ttm_resource_manager *man, static void amdgpu_preempt_mgr_del(struct ttm_resource_manager *man,
struct ttm_resource *res) struct ttm_resource *res)
{ {
struct amdgpu_preempt_mgr *mgr = to_preempt_mgr(man);
atomic64_sub(res->num_pages, &mgr->used);
ttm_resource_fini(man, res); ttm_resource_fini(man, res);
kfree(res); kfree(res);
} }
/**
* amdgpu_preempt_mgr_usage - return usage of PREEMPT domain
*
* @man: TTM memory type manager
*
* Return how many bytes are used in the GTT domain
*/
uint64_t amdgpu_preempt_mgr_usage(struct ttm_resource_manager *man)
{
struct amdgpu_preempt_mgr *mgr = to_preempt_mgr(man);
s64 result = atomic64_read(&mgr->used);
return (result > 0 ? result : 0) * PAGE_SIZE;
}
/**
* amdgpu_preempt_mgr_debug - dump VRAM table
*
* @man: TTM memory type manager
* @printer: DRM printer to use
*
* Dump the table content using printk.
*/
static void amdgpu_preempt_mgr_debug(struct ttm_resource_manager *man,
struct drm_printer *printer)
{
struct amdgpu_preempt_mgr *mgr = to_preempt_mgr(man);
drm_printf(printer, "man size:%llu pages, preempt used:%lld pages\n",
man->size, (u64)atomic64_read(&mgr->used));
}
static const struct ttm_resource_manager_func amdgpu_preempt_mgr_func = { static const struct ttm_resource_manager_func amdgpu_preempt_mgr_func = {
.alloc = amdgpu_preempt_mgr_new, .alloc = amdgpu_preempt_mgr_new,
.free = amdgpu_preempt_mgr_del, .free = amdgpu_preempt_mgr_del,
.debug = amdgpu_preempt_mgr_debug
}; };
/** /**
@ -146,8 +99,7 @@ static const struct ttm_resource_manager_func amdgpu_preempt_mgr_func = {
*/ */
int amdgpu_preempt_mgr_init(struct amdgpu_device *adev) int amdgpu_preempt_mgr_init(struct amdgpu_device *adev)
{ {
struct amdgpu_preempt_mgr *mgr = &adev->mman.preempt_mgr; struct ttm_resource_manager *man = &adev->mman.preempt_mgr;
struct ttm_resource_manager *man = &mgr->manager;
int ret; int ret;
man->use_tt = true; man->use_tt = true;
@ -155,16 +107,13 @@ int amdgpu_preempt_mgr_init(struct amdgpu_device *adev)
ttm_resource_manager_init(man, &adev->mman.bdev, (1 << 30)); ttm_resource_manager_init(man, &adev->mman.bdev, (1 << 30));
atomic64_set(&mgr->used, 0);
ret = device_create_file(adev->dev, &dev_attr_mem_info_preempt_used); ret = device_create_file(adev->dev, &dev_attr_mem_info_preempt_used);
if (ret) { if (ret) {
DRM_ERROR("Failed to create device file mem_info_preempt_used\n"); DRM_ERROR("Failed to create device file mem_info_preempt_used\n");
return ret; return ret;
} }
ttm_set_driver_manager(&adev->mman.bdev, AMDGPU_PL_PREEMPT, ttm_set_driver_manager(&adev->mman.bdev, AMDGPU_PL_PREEMPT, man);
&mgr->manager);
ttm_resource_manager_set_used(man, true); ttm_resource_manager_set_used(man, true);
return 0; return 0;
} }
@ -179,8 +128,7 @@ int amdgpu_preempt_mgr_init(struct amdgpu_device *adev)
*/ */
void amdgpu_preempt_mgr_fini(struct amdgpu_device *adev) void amdgpu_preempt_mgr_fini(struct amdgpu_device *adev)
{ {
struct amdgpu_preempt_mgr *mgr = &adev->mman.preempt_mgr; struct ttm_resource_manager *man = &adev->mman.preempt_mgr;
struct ttm_resource_manager *man = &mgr->manager;
int ret; int ret;
ttm_resource_manager_set_used(man, false); ttm_resource_manager_set_used(man, false);

7
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h
View file

@ -54,11 +54,6 @@ struct amdgpu_gtt_mgr {
spinlock_t lock; spinlock_t lock;
}; };
struct amdgpu_preempt_mgr {
struct ttm_resource_manager manager;
atomic64_t used;
};
struct amdgpu_mman { struct amdgpu_mman {
struct ttm_device bdev; struct ttm_device bdev;
bool initialized; bool initialized;
@ -75,7 +70,7 @@ struct amdgpu_mman {
struct amdgpu_vram_mgr vram_mgr; struct amdgpu_vram_mgr vram_mgr;
struct amdgpu_gtt_mgr gtt_mgr; struct amdgpu_gtt_mgr gtt_mgr;
struct amdgpu_preempt_mgr preempt_mgr; struct ttm_resource_manager preempt_mgr;
uint64_t stolen_vga_size; uint64_t stolen_vga_size;
struct amdgpu_bo *stolen_vga_memory; struct amdgpu_bo *stolen_vga_memory;