Commit 2b70af79 authored by Lang Yu's avatar Lang Yu Committed by Andrey Grodzovsky

drm/amdgpu: switch gtt_mgr to counting used pages

Change mgr->available into mgr->used (invert the value).

Makes more sense to do it this way since we don't need the spinlock any
more to double check the handling.

v3 (chk): separated from the TEMPOARAY FLAG change.
Signed-off-by: default avatarLang Yu <Lang.Yu@amd.com>
Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAndrey Grodzovsky <andrey.grodzovsky@amd.com>
Acked-by: default avatarNirmoy Das <nirmoy.das@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210622162339.761651-4-andrey.grodzovsky@amd.com
parent 9a22149e
...@@ -132,15 +132,11 @@ static int amdgpu_gtt_mgr_new(struct ttm_resource_manager *man, ...@@ -132,15 +132,11 @@ static int amdgpu_gtt_mgr_new(struct ttm_resource_manager *man,
struct amdgpu_gtt_node *node; struct amdgpu_gtt_node *node;
int r; int r;
if (!(place->flags & TTM_PL_FLAG_TEMPORARY)) { if (!(place->flags & TTM_PL_FLAG_TEMPORARY) &&
spin_lock(&mgr->lock); atomic64_add_return(num_pages, &mgr->used) > man->size) {
if (atomic64_read(&mgr->available) < num_pages) { atomic64_sub(num_pages, &mgr->used);
spin_unlock(&mgr->lock);
return -ENOSPC; return -ENOSPC;
} }
atomic64_sub(num_pages, &mgr->available);
spin_unlock(&mgr->lock);
}
node = kzalloc(struct_size(node, base.mm_nodes, 1), GFP_KERNEL); node = kzalloc(struct_size(node, base.mm_nodes, 1), GFP_KERNEL);
if (!node) { if (!node) {
...@@ -177,7 +173,7 @@ static int amdgpu_gtt_mgr_new(struct ttm_resource_manager *man, ...@@ -177,7 +173,7 @@ static int amdgpu_gtt_mgr_new(struct ttm_resource_manager *man,
err_out: err_out:
if (!(place->flags & TTM_PL_FLAG_TEMPORARY)) if (!(place->flags & TTM_PL_FLAG_TEMPORARY))
atomic64_add(num_pages, &mgr->available); atomic64_sub(num_pages, &mgr->used);
return r; return r;
} }
...@@ -202,7 +198,7 @@ static void amdgpu_gtt_mgr_del(struct ttm_resource_manager *man, ...@@ -202,7 +198,7 @@ static void amdgpu_gtt_mgr_del(struct ttm_resource_manager *man,
spin_unlock(&mgr->lock); spin_unlock(&mgr->lock);
if (!(res->placement & TTM_PL_FLAG_TEMPORARY)) if (!(res->placement & TTM_PL_FLAG_TEMPORARY))
atomic64_add(res->num_pages, &mgr->available); atomic64_sub(res->num_pages, &mgr->used);
kfree(node); kfree(node);
} }
...@@ -217,9 +213,8 @@ static void amdgpu_gtt_mgr_del(struct ttm_resource_manager *man, ...@@ -217,9 +213,8 @@ static void amdgpu_gtt_mgr_del(struct ttm_resource_manager *man,
uint64_t amdgpu_gtt_mgr_usage(struct ttm_resource_manager *man) uint64_t amdgpu_gtt_mgr_usage(struct ttm_resource_manager *man)
{ {
struct amdgpu_gtt_mgr *mgr = to_gtt_mgr(man); struct amdgpu_gtt_mgr *mgr = to_gtt_mgr(man);
s64 result = man->size - atomic64_read(&mgr->available);
return (result > 0 ? result : 0) * PAGE_SIZE; return atomic64_read(&mgr->used) * PAGE_SIZE;
} }
/** /**
...@@ -269,9 +264,8 @@ static void amdgpu_gtt_mgr_debug(struct ttm_resource_manager *man, ...@@ -269,9 +264,8 @@ static void amdgpu_gtt_mgr_debug(struct ttm_resource_manager *man,
drm_mm_print(&mgr->mm, printer); drm_mm_print(&mgr->mm, printer);
spin_unlock(&mgr->lock); spin_unlock(&mgr->lock);
drm_printf(printer, "man size:%llu pages, gtt available:%lld pages, usage:%lluMB\n", drm_printf(printer, "man size:%llu pages, gtt used:%llu pages\n",
man->size, (u64)atomic64_read(&mgr->available), man->size, atomic64_read(&mgr->used));
amdgpu_gtt_mgr_usage(man) >> 20);
} }
static const struct ttm_resource_manager_func amdgpu_gtt_mgr_func = { static const struct ttm_resource_manager_func amdgpu_gtt_mgr_func = {
...@@ -303,7 +297,7 @@ int amdgpu_gtt_mgr_init(struct amdgpu_device *adev, uint64_t gtt_size) ...@@ -303,7 +297,7 @@ int amdgpu_gtt_mgr_init(struct amdgpu_device *adev, uint64_t gtt_size)
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, gtt_size >> PAGE_SHIFT); atomic64_set(&mgr->used, 0);
ttm_set_driver_manager(&adev->mman.bdev, TTM_PL_TT, &mgr->manager); ttm_set_driver_manager(&adev->mman.bdev, TTM_PL_TT, &mgr->manager);
ttm_resource_manager_set_used(man, true); ttm_resource_manager_set_used(man, true);
......
...@@ -52,7 +52,7 @@ struct amdgpu_gtt_mgr { ...@@ -52,7 +52,7 @@ struct amdgpu_gtt_mgr {
struct ttm_resource_manager manager; struct ttm_resource_manager manager;
struct drm_mm mm; struct drm_mm mm;
spinlock_t lock; spinlock_t lock;
atomic64_t available; atomic64_t used;
}; };
struct amdgpu_preempt_mgr { struct amdgpu_preempt_mgr {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment