Mesa (master): nvc0: tie buffer memory release to the buffer fence
Christoph Bumiller
chrisbmr at kemper.freedesktop.org
Sat Jan 8 01:15:24 UTC 2011
Module: Mesa
Branch: master
Commit: bd301dfc12be76b155d9b2b65c4e4f142ab94320
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=bd301dfc12be76b155d9b2b65c4e4f142ab94320
Author: Christoph Bumiller <e0425955 at student.tuwien.ac.at>
Date: Wed Jan 5 01:41:49 2011 +0100
nvc0: tie buffer memory release to the buffer fence
... instead of the next fence to be emitted. This way we have a
chance to reclaim the storage earlier.
---
src/gallium/drivers/nvc0/nvc0_buffer.c | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/gallium/drivers/nvc0/nvc0_buffer.c b/src/gallium/drivers/nvc0/nvc0_buffer.c
index 8021e43..0c19c52 100644
--- a/src/gallium/drivers/nvc0/nvc0_buffer.c
+++ b/src/gallium/drivers/nvc0/nvc0_buffer.c
@@ -51,8 +51,12 @@ nvc0_buffer_allocate(struct nvc0_screen *screen, struct nvc0_resource *buf,
static INLINE void
release_allocation(struct nvc0_mm_allocation **mm, struct nvc0_fence *fence)
{
- (*mm)->next = fence->buffers;
- fence->buffers = (*mm);
+ if (fence && fence->state != NVC0_FENCE_STATE_SIGNALLED) {
+ (*mm)->next = fence->buffers;
+ fence->buffers = (*mm);
+ } else {
+ nvc0_mm_free(*mm);
+ }
(*mm) = NULL;
}
@@ -60,13 +64,12 @@ static void
nvc0_buffer_destroy(struct pipe_screen *pscreen,
struct pipe_resource *presource)
{
- struct nvc0_screen *screen = nvc0_screen(pscreen);
struct nvc0_resource *res = nvc0_resource(presource);
nouveau_bo_ref(NULL, &res->bo);
if (res->mm)
- release_allocation(&res->mm, screen->fence.current);
+ release_allocation(&res->mm, res->fence);
if (res->data && !(res->status & NVC0_BUFFER_STATUS_USER_MEMORY))
FREE(res->data);
More information about the mesa-commit
mailing list