Mesa (nvc0): nouveau: fix compiler complaint
Ben Skeggs
darktama at kemper.freedesktop.org
Tue Mar 1 07:25:13 UTC 2011
Module: Mesa
Branch: nvc0
Commit: d6bdf1f6ae6f8d06db740ad75e9151ef275755b2
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d6bdf1f6ae6f8d06db740ad75e9151ef275755b2
Author: Ben Skeggs <bskeggs at redhat.com>
Date: Tue Mar 1 10:31:54 2011 +1000
nouveau: fix compiler complaint
Signed-off-by: Ben Skeggs <bskeggs at redhat.com>
---
src/gallium/drivers/nouveau/nouveau_mm.c | 6 ++++++
src/gallium/drivers/nouveau/nouveau_mm.h | 3 +++
src/gallium/drivers/nv50/nv50_buffer.c | 2 +-
src/gallium/drivers/nv50/nv50_query.c | 2 +-
4 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/gallium/drivers/nouveau/nouveau_mm.c b/src/gallium/drivers/nouveau/nouveau_mm.c
index 1c4bb61..332b8dc 100644
--- a/src/gallium/drivers/nouveau/nouveau_mm.c
+++ b/src/gallium/drivers/nouveau/nouveau_mm.c
@@ -222,6 +222,12 @@ nouveau_mm_free(struct nouveau_mm_allocation *alloc)
FREE(alloc);
}
+void
+nouveau_mm_free_work(void *data)
+{
+ nouveau_mm_free(data);
+}
+
struct nouveau_mman *
nouveau_mm_create(struct nouveau_device *dev, uint32_t domain,
uint32_t storage_type)
diff --git a/src/gallium/drivers/nouveau/nouveau_mm.h b/src/gallium/drivers/nouveau/nouveau_mm.h
index 23e50d4..5b57c8b 100644
--- a/src/gallium/drivers/nouveau/nouveau_mm.h
+++ b/src/gallium/drivers/nouveau/nouveau_mm.h
@@ -26,4 +26,7 @@ nouveau_mm_allocate(struct nouveau_mman *, uint32_t size,
extern void
nouveau_mm_free(struct nouveau_mm_allocation *);
+extern void
+nouveau_mm_free_work(void *);
+
#endif // __NOUVEAU_MM_H__
diff --git a/src/gallium/drivers/nv50/nv50_buffer.c b/src/gallium/drivers/nv50/nv50_buffer.c
index f808adb..7b2b47a 100644
--- a/src/gallium/drivers/nv50/nv50_buffer.c
+++ b/src/gallium/drivers/nv50/nv50_buffer.c
@@ -52,7 +52,7 @@ nv50_buffer_allocate(struct nv50_screen *screen, struct nv50_resource *buf,
static INLINE void
release_allocation(struct nouveau_mm_allocation **mm, struct nouveau_fence *fence)
{
- nouveau_fence_work(fence, nouveau_mm_free, *mm);
+ nouveau_fence_work(fence, nouveau_mm_free_work, *mm);
(*mm) = NULL;
}
diff --git a/src/gallium/drivers/nv50/nv50_query.c b/src/gallium/drivers/nv50/nv50_query.c
index 8a2bca6..2803626 100644
--- a/src/gallium/drivers/nv50/nv50_query.c
+++ b/src/gallium/drivers/nv50/nv50_query.c
@@ -64,7 +64,7 @@ nv50_query_allocate(struct nv50_context *nv50, struct nv50_query *q, int size)
if (q->ready)
nouveau_mm_free(q->mm);
else
- nouveau_fence_work(screen->base.fence.current, nouveau_mm_free, q->mm);
+ nouveau_fence_work(screen->base.fence.current, nouveau_mm_free_work, q->mm);
}
}
if (size) {
More information about the mesa-commit
mailing list