X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fdrivers%2Fnouveau%2Fnouveau_fence.c;h=d0c66c56128e9a9d7a0b36f176bfdb9418c7020c;hb=c578600489e35abb481816c87124b1dc6b279655;hp=691553ae7e4ffcf22a186a1000c36c5b54d9488f;hpb=1469ccb7464836c752fa2664c36d8fae7e80606c;p=mesa.git

diff --git a/src/gallium/drivers/nouveau/nouveau_fence.c b/src/gallium/drivers/nouveau/nouveau_fence.c
index 691553ae7e4..d0c66c56128 100644
--- a/src/gallium/drivers/nouveau/nouveau_fence.c
+++ b/src/gallium/drivers/nouveau/nouveau_fence.c
@@ -23,15 +23,14 @@
 #include "nouveau_screen.h"
 #include "nouveau_winsys.h"
 #include "nouveau_fence.h"
-#include "os/os_time.h"
+#include "util/os_time.h"
 
 #ifdef PIPE_OS_UNIX
 #include <sched.h>
 #endif
 
 bool
-nouveau_fence_new(struct nouveau_screen *screen, struct nouveau_fence **fence,
-                  bool emit)
+nouveau_fence_new(struct nouveau_screen *screen, struct nouveau_fence **fence)
 {
    *fence = CALLOC_STRUCT(nouveau_fence);
    if (!*fence)
@@ -39,10 +38,7 @@ nouveau_fence_new(struct nouveau_screen *screen, struct nouveau_fence **fence,
 
    (*fence)->screen = screen;
    (*fence)->ref = 1;
-   LIST_INITHEAD(&(*fence)->work);
-
-   if (emit)
-      nouveau_fence_emit(*fence);
+   list_inithead(&(*fence)->work);
 
    return true;
 }
@@ -54,7 +50,7 @@ nouveau_fence_trigger_work(struct nouveau_fence *fence)
 
    LIST_FOR_EACH_ENTRY_SAFE(work, tmp, &fence->work, list) {
       work->func(work->data);
-      LIST_DEL(&work->list);
+      list_del(&work->list);
       FREE(work);
    }
 }
@@ -242,7 +238,7 @@ nouveau_fence_next(struct nouveau_screen *screen)
 
    nouveau_fence_ref(NULL, &screen->fence.current);
 
-   nouveau_fence_new(screen, &screen->fence.current, false);
+   nouveau_fence_new(screen, &screen->fence.current);
 }
 
 void
@@ -269,7 +265,7 @@ nouveau_fence_work(struct nouveau_fence *fence,
       return false;
    work->func = func;
    work->data = data;
-   LIST_ADD(&work->list, &fence->work);
+   list_add(&work->list, &fence->work);
    p_atomic_inc(&fence->work_count);
    if (fence->work_count > 64)
       nouveau_fence_kick(fence);