fdo-mirrors/mesa-drm
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/drm.git synced 2026-05-07 12:18:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

ttm: Adjust swapping target so that current allocation will succeed.

Browse source
This commit is contained in:
Thomas Hellstrom 2009-02-17 09:07:49 +01:00
parent e8eb30ad8b
commit 875a6ae217
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
linux-core/ttm/ttm_memory.c
View file

@ -42,7 +42,8 @@
* many threads may try to swap out at any given time.
*/
static void ttm_shrink(struct ttm_mem_global *glob, bool from_workqueue)
static void ttm_shrink(struct ttm_mem_global *glob, bool from_workqueue,
uint64_t extra)
{
int ret;
struct ttm_mem_shrink *shrink;
@ -64,6 +65,9 @@ static void ttm_shrink(struct ttm_mem_global *glob, bool from_workqueue)
target = glob->max_memory;
}
total_target = (extra >= total_target) ? 0: total_target - extra;
target = (extra >= target) ? 0: target - extra;
while (glob->used_memory > target ||
glob->used_total_memory > total_target) {
shrink = glob->shrink;
@ -82,7 +86,7 @@ static void ttm_shrink_work(struct work_struct *work)
struct ttm_mem_global *glob =
container_of(work, struct ttm_mem_global, work);
ttm_shrink(glob, true);
ttm_shrink(glob, true, 0ULL);
}
int ttm_mem_global_init(struct ttm_mem_global *glob)
@ -203,7 +207,7 @@ int ttm_mem_global_alloc(struct ttm_mem_global *glob, uint64_t memory,
return -ENOMEM;
if (unlikely(count-- == 0))
return -ENOMEM;
ttm_shrink(glob, false);
ttm_shrink(glob, false, memory + (memory >> 2) + 16);
}
return 0;