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

freedreno/drm: Remove bo_del_or_recycle()

Browse source 
In prep for the next patch, where locking is swapped around to cover the
whole bo_del() path, decouple handling of the recycle-to-BO-cache path.

Signed-off-by: Rob Clark <robdclark@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20918>
This commit is contained in:
Rob Clark 2023-01-25 14:30:31 -08:00 • committed by Marge Bot
parent 160137ccae
commit 5a46e884ea
2 changed files with 36 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
src/freedreno/drm/freedreno_bo.c
View file

@ -298,23 +298,22 @@ fd_bo_ref(struct fd_bo *bo)
static uint32_t bo_del(struct fd_bo *bo);
static void close_handles(struct fd_device *dev, uint32_t *handles, unsigned cnt);
static uint32_t
bo_del_or_recycle(struct fd_bo *bo)
static bool
try_recycle(struct fd_bo *bo)
{
struct fd_device *dev = bo->dev;
/* No point in BO cache for suballocated buffers: */
if (!suballoc_bo(bo)) {
if ((bo->bo_reuse == BO_CACHE) &&
(fd_bo_cache_free(&dev->bo_cache, bo) == 0))
return 0;
if (suballoc_bo(bo))
return false;
if ((bo->bo_reuse == RING_CACHE) &&
(fd_bo_cache_free(&dev->ring_cache, bo) == 0))
return 0;
}
if (bo->bo_reuse == BO_CACHE)
return fd_bo_cache_free(&dev->bo_cache, bo) == 0;
return bo_del(bo);
if (bo->bo_reuse == RING_CACHE)
return fd_bo_cache_free(&dev->ring_cache, bo) == 0;
return false;
}
void
@ -323,34 +322,53 @@ fd_bo_del(struct fd_bo *bo)
if (!unref(&bo->refcnt))
return;
if (try_recycle(bo))
return;
struct fd_device *dev = bo->dev;
uint32_t handle = bo_del_or_recycle(bo);
uint32_t handle = bo_del(bo);
if (handle)
close_handles(dev, &handle, 1);
}
void
fd_bo_del_array(struct fd_bo **bos, unsigned count)
fd_bo_del_array(struct fd_bo **bos, int count)
{
if (!count)
return;
struct fd_device *dev = bos[0]->dev;
/*
* First pass, remove objects from the table that either (a) still have
* a live reference, or (b) no longer have a reference but are released
* to the BO cache:
*/
for (int i = 0; i < count; i++) {
if (!unref(&bos[i]->refcnt) || try_recycle(bos[i])) {
bos[i--] = bos[--count];
}
}
/*
* Second pass, delete all of the objects remaining after first pass.
*/
uint32_t handles[64];
unsigned cnt = 0;
for (unsigned i = 0; i < count; i++) {
if (!unref(&bos[i]->refcnt))
continue;
for (int i = 0; i < count; i++) {
if (cnt == ARRAY_SIZE(handles)) {
close_handles(dev, handles, cnt);
cnt = 0;
}
handles[cnt] = bo_del_or_recycle(bos[i]);
handles[cnt] = bo_del(bos[i]);
if (handles[cnt])
cnt++;
}
close_handles(dev, handles, cnt);
}

2
src/freedreno/drm/freedreno_drmif.h
View file

@ -298,7 +298,7 @@ fd_bo_get_iova(struct fd_bo *bo)
struct fd_bo *fd_bo_ref(struct fd_bo *bo);
void fd_bo_del(struct fd_bo *bo);
void fd_bo_del_array(struct fd_bo **bos, unsigned count);
void fd_bo_del_array(struct fd_bo **bos, int count);
void fd_bo_del_list_nocache(struct list_head *list);
int fd_bo_get_name(struct fd_bo *bo, uint32_t *name);
uint32_t fd_bo_handle(struct fd_bo *bo);