AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-28 11:18:45 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

drm/amdgpu/ttm: init managers from the driver side.

Browse Source 
Use new init calls to unwrap manager init

Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200804025632.3868079-16-airlied@gmail.com
This commit is contained in:
Dave Airlie 2020-08-04 12:55:48 +10:00
parent 3c90424bd7
commit 158d20d185
4 changed files with 33 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c
View File

@ -76,6 +76,7 @@ static DEVICE_ATTR(mem_info_gtt_total, S_IRUGO,
static DEVICE_ATTR(mem_info_gtt_used, S_IRUGO, static DEVICE_ATTR(mem_info_gtt_used, S_IRUGO,
amdgpu_mem_info_gtt_used_show, NULL); amdgpu_mem_info_gtt_used_show, NULL);
static const struct ttm_mem_type_manager_func amdgpu_gtt_mgr_func;
/** /**
* amdgpu_gtt_mgr_init - init GTT manager and DRM MM * amdgpu_gtt_mgr_init - init GTT manager and DRM MM
* *
@ -84,14 +85,20 @@ static DEVICE_ATTR(mem_info_gtt_used, S_IRUGO,
* *
* Allocate and initialize the GTT manager. * Allocate and initialize the GTT manager.
*/ */
static int amdgpu_gtt_mgr_init(struct ttm_mem_type_manager *man, int amdgpu_gtt_mgr_init(struct amdgpu_device *adev, uint64_t gtt_size)
unsigned long p_size)
{ {
struct amdgpu_device *adev = amdgpu_ttm_adev(man->bdev); struct ttm_mem_type_manager *man = &adev->mman.bdev.man[TTM_PL_TT];
struct amdgpu_gtt_mgr *mgr; struct amdgpu_gtt_mgr *mgr;
uint64_t start, size; uint64_t start, size;
int ret; int ret;
man->use_tt = true;
man->func = &amdgpu_gtt_mgr_func;
man->available_caching = TTM_PL_MASK_CACHING;
man->default_caching = TTM_PL_FLAG_CACHED;
ttm_mem_type_manager_init(&adev->mman.bdev, man, gtt_size >> PAGE_SHIFT);
mgr = kzalloc(sizeof(*mgr), GFP_KERNEL); mgr = kzalloc(sizeof(*mgr), GFP_KERNEL);
if (!mgr) if (!mgr)
return -ENOMEM; return -ENOMEM;
@ -100,7 +107,7 @@ static int amdgpu_gtt_mgr_init(struct ttm_mem_type_manager *man,
size = (adev->gmc.gart_size >> PAGE_SHIFT) - start; size = (adev->gmc.gart_size >> PAGE_SHIFT) - start;
drm_mm_init(&mgr->mm, start, size); drm_mm_init(&mgr->mm, start, size);
spin_lock_init(&mgr->lock); spin_lock_init(&mgr->lock);
atomic64_set(&mgr->available, p_size); atomic64_set(&mgr->available, gtt_size >> PAGE_SHIFT);
man->priv = mgr; man->priv = mgr;
ret = device_create_file(adev->dev, &dev_attr_mem_info_gtt_total); ret = device_create_file(adev->dev, &dev_attr_mem_info_gtt_total);
@ -114,6 +121,7 @@ static int amdgpu_gtt_mgr_init(struct ttm_mem_type_manager *man,
return ret; return ret;
} }
ttm_mem_type_manager_set_used(man, true);
return 0; return 0;
} }
@ -300,8 +308,7 @@ static void amdgpu_gtt_mgr_debug(struct ttm_mem_type_manager *man,
amdgpu_gtt_mgr_usage(man) >> 20); amdgpu_gtt_mgr_usage(man) >> 20);
} }
const struct ttm_mem_type_manager_func amdgpu_gtt_mgr_func = { static const struct ttm_mem_type_manager_func amdgpu_gtt_mgr_func = {
.init = amdgpu_gtt_mgr_init,
.takedown = amdgpu_gtt_mgr_fini, .takedown = amdgpu_gtt_mgr_fini,
.get_node = amdgpu_gtt_mgr_new, .get_node = amdgpu_gtt_mgr_new,
.put_node = amdgpu_gtt_mgr_del, .put_node = amdgpu_gtt_mgr_del,

37
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
View File

@ -62,43 +62,16 @@
#define AMDGPU_TTM_VRAM_MAX_DW_READ (size_t)128 #define AMDGPU_TTM_VRAM_MAX_DW_READ (size_t)128
static int amdgpu_ttm_init_vram(struct amdgpu_device *adev)
{
struct ttm_mem_type_manager *man = &adev->mman.bdev.man[TTM_PL_VRAM];
man->func = &amdgpu_vram_mgr_func;
man->available_caching = TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_WC;
man->default_caching = TTM_PL_FLAG_WC;
return ttm_bo_init_mm(&adev->mman.bdev, TTM_PL_VRAM,
adev->gmc.real_vram_size >> PAGE_SHIFT);
}
static int amdgpu_ttm_init_gtt(struct amdgpu_device *adev, uint64_t gtt_size)
{
struct ttm_mem_type_manager *man = &adev->mman.bdev.man[TTM_PL_TT];
man->use_tt = true;
man->func = &amdgpu_gtt_mgr_func;
man->available_caching = TTM_PL_MASK_CACHING;
man->default_caching = TTM_PL_FLAG_CACHED;
return ttm_bo_init_mm(&adev->mman.bdev, TTM_PL_TT,
gtt_size >> PAGE_SHIFT);
}
static int amdgpu_ttm_init_on_chip(struct amdgpu_device *adev, static int amdgpu_ttm_init_on_chip(struct amdgpu_device *adev,
unsigned int type, unsigned int type,
uint64_t size) uint64_t size)
{ {
struct ttm_mem_type_manager *man = &adev->mman.bdev.man[type]; struct ttm_mem_type_manager *man = &adev->mman.bdev.man[type];
man->func = &ttm_bo_manager_func;
man->available_caching = TTM_PL_FLAG_UNCACHED; man->available_caching = TTM_PL_FLAG_UNCACHED;
man->default_caching = TTM_PL_FLAG_UNCACHED; man->default_caching = TTM_PL_FLAG_UNCACHED;
return ttm_bo_init_mm(&adev->mman.bdev, type, size); return ttm_range_man_init(&adev->mman.bdev, man, size >> PAGE_SHIFT);
} }
/** /**
@ -1883,7 +1856,7 @@ int amdgpu_ttm_init(struct amdgpu_device *adev)
adev->mman.bdev.no_retry = true; adev->mman.bdev.no_retry = true;
/* Initialize VRAM pool with all of VRAM divided into pages */ /* Initialize VRAM pool with all of VRAM divided into pages */
r = amdgpu_ttm_init_vram(adev); r = amdgpu_vram_mgr_init(adev);
if (r) { if (r) {
DRM_ERROR("Failed initializing VRAM heap.\n"); DRM_ERROR("Failed initializing VRAM heap.\n");
return r; return r;
@ -1964,7 +1937,7 @@ int amdgpu_ttm_init(struct amdgpu_device *adev)
gtt_size = (uint64_t)amdgpu_gtt_size << 20; gtt_size = (uint64_t)amdgpu_gtt_size << 20;
/* Initialize GTT memory pool */ /* Initialize GTT memory pool */
r = amdgpu_ttm_init_gtt(adev, gtt_size); r = amdgpu_gtt_mgr_init(adev, gtt_size);
if (r) { if (r) {
DRM_ERROR("Failed initializing GTT heap.\n"); DRM_ERROR("Failed initializing GTT heap.\n");
return r; return r;

4
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h
View File

@ -67,8 +67,8 @@ struct amdgpu_copy_mem {
unsigned long offset; unsigned long offset;
}; };
extern const struct ttm_mem_type_manager_func amdgpu_gtt_mgr_func; int amdgpu_gtt_mgr_init(struct amdgpu_device *adev, uint64_t gtt_size);
extern const struct ttm_mem_type_manager_func amdgpu_vram_mgr_func; int amdgpu_vram_mgr_init(struct amdgpu_device *adev);
bool amdgpu_gtt_mgr_has_gart_addr(struct ttm_mem_reg *mem); bool amdgpu_gtt_mgr_has_gart_addr(struct ttm_mem_reg *mem);
uint64_t amdgpu_gtt_mgr_usage(struct ttm_mem_type_manager *man); uint64_t amdgpu_gtt_mgr_usage(struct ttm_mem_type_manager *man);

19
drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
View File

@ -158,6 +158,8 @@ static const struct attribute *amdgpu_vram_mgr_attributes[] = {
NULL NULL
}; };
static const struct ttm_mem_type_manager_func amdgpu_vram_mgr_func;
/** /**
* amdgpu_vram_mgr_init - init VRAM manager and DRM MM * amdgpu_vram_mgr_init - init VRAM manager and DRM MM
* *
@ -166,18 +168,23 @@ static const struct attribute *amdgpu_vram_mgr_attributes[] = {
* *
* Allocate and initialize the VRAM manager. * Allocate and initialize the VRAM manager.
*/ */
static int amdgpu_vram_mgr_init(struct ttm_mem_type_manager *man, int amdgpu_vram_mgr_init(struct amdgpu_device *adev)
unsigned long p_size)
{ {
struct amdgpu_device *adev = amdgpu_ttm_adev(man->bdev); struct ttm_mem_type_manager *man = &adev->mman.bdev.man[TTM_PL_VRAM];
struct amdgpu_vram_mgr *mgr; struct amdgpu_vram_mgr *mgr;
int ret; int ret;
man->available_caching = TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_WC;
man->default_caching = TTM_PL_FLAG_WC;
ttm_mem_type_manager_init(&adev->mman.bdev, man, adev->gmc.real_vram_size >> PAGE_SHIFT);
man->func = &amdgpu_vram_mgr_func;
mgr = kzalloc(sizeof(*mgr), GFP_KERNEL); mgr = kzalloc(sizeof(*mgr), GFP_KERNEL);
if (!mgr) if (!mgr)
return -ENOMEM; return -ENOMEM;
drm_mm_init(&mgr->mm, 0, p_size); drm_mm_init(&mgr->mm, 0, man->size);
spin_lock_init(&mgr->lock); spin_lock_init(&mgr->lock);
man->priv = mgr; man->priv = mgr;
@ -186,6 +193,7 @@ static int amdgpu_vram_mgr_init(struct ttm_mem_type_manager *man,
if (ret) if (ret)
DRM_ERROR("Failed to register sysfs\n"); DRM_ERROR("Failed to register sysfs\n");
ttm_mem_type_manager_set_used(man, true);
return 0; return 0;
} }
@ -589,8 +597,7 @@ static void amdgpu_vram_mgr_debug(struct ttm_mem_type_manager *man,
amdgpu_vram_mgr_vis_usage(man) >> 20); amdgpu_vram_mgr_vis_usage(man) >> 20);
} }
const struct ttm_mem_type_manager_func amdgpu_vram_mgr_func = { static const struct ttm_mem_type_manager_func amdgpu_vram_mgr_func = {
.init = amdgpu_vram_mgr_init,
.takedown = amdgpu_vram_mgr_fini, .takedown = amdgpu_vram_mgr_fini,
.get_node = amdgpu_vram_mgr_new, .get_node = amdgpu_vram_mgr_new,
.put_node = amdgpu_vram_mgr_del, .put_node = amdgpu_vram_mgr_del,