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

nouveau/mm: pass mm_bucket to mm_slab_new

Browse source 
We relied on mm_slab_new choosing the same bucket the caller used, just
pass it in.

Signed-off-by: Karol Herbst <kherbst@redhat.com>
Reviewed-by: Pierre Moreau <dev@pmoreau.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8765>
This commit is contained in:
Karol Herbst 2021-01-27 10:43:06 +01:00 • committed by Marge Bot
parent b7d2add5e0
commit de0a0d2f02
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/gallium/drivers/nouveau/nouveau_mm.c
View file

@ -118,7 +118,7 @@ mm_default_slab_size(unsigned chunk_order)
}
static int
mm_slab_new(struct nouveau_mman *cache, int chunk_order)
mm_slab_new(struct nouveau_mman *cache, struct mm_bucket *bucket, int chunk_order)
{
struct mm_slab *slab;
int words, ret;
@ -148,7 +148,8 @@ mm_slab_new(struct nouveau_mman *cache, int chunk_order)
slab->order = chunk_order;
slab->count = slab->free = size >> chunk_order;
list_add(&slab->head, &mm_bucket_by_order(cache, chunk_order)->free);
assert(bucket == mm_bucket_by_order(cache, chunk_order));
list_add(&slab->head, &bucket->free);
cache->allocated += size;
@ -185,7 +186,7 @@ nouveau_mm_allocate(struct nouveau_mman *cache,
slab = LIST_ENTRY(struct mm_slab, bucket->used.next, head);
} else {
if (list_is_empty(&bucket->free)) {
mm_slab_new(cache, MAX2(mm_get_order(size), MM_MIN_ORDER));
mm_slab_new(cache, bucket, MAX2(mm_get_order(size), MM_MIN_ORDER));
}
slab = LIST_ENTRY(struct mm_slab, bucket->free.next, head);