nouveau: fix compiler complaint

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

diff --git a/src/gallium/drivers/nouveau/nouveau_mm.c b/src/gallium/drivers/nouveau/nouveau_mm.c
index 1c4bb61af88e9db201c1ec13d2d8bbe9af691dca..332b8dc02e3d12c08904f362136a3e261cdd25e9 100644 (file)
--- 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 23e50d4ae54eeb6e199e8f8522b3e61ef26d6e19..5b57c8ba4f21ef31d78df5f8950c99df8bef26f0 100644 (file)
--- 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 f808adb0f621675140edea4e8d21888d56a3eab6..7b2b47a1e051b08a2eebee0eb636aad36465e0dc 100644 (file)
--- 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 8a2bca6850add58884dcc3f433b5c123c9e20972..2803626d18c0e3ff6f3356992e6eece5eb887270 100644 (file)
--- 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) {