From 9c5003996ce770d0a377d6323a7ebef237de5513 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Mon, 16 Jan 2017 16:25:19 +0000 Subject: [PATCH] nouveau: remove always false argument in nouveau_fence_new() No point in having the extra argument considering that it's effectively unused since the function was introduced. Cc: Ilia Mirkin Signed-off-by: Emil Velikov Reviewed-by: Ilia Mirkin --- src/gallium/drivers/nouveau/nouveau_fence.c | 8 ++------ src/gallium/drivers/nouveau/nouveau_fence.h | 3 +-- src/gallium/drivers/nouveau/nv30/nv30_screen.c | 2 +- src/gallium/drivers/nouveau/nv50/nv50_screen.c | 2 +- src/gallium/drivers/nouveau/nvc0/nvc0_screen.c | 2 +- 5 files changed, 6 insertions(+), 11 deletions(-) diff --git a/src/gallium/drivers/nouveau/nouveau_fence.c b/src/gallium/drivers/nouveau/nouveau_fence.c index 691553ae7e4..6c299cbc6a5 100644 --- a/src/gallium/drivers/nouveau/nouveau_fence.c +++ b/src/gallium/drivers/nouveau/nouveau_fence.c @@ -30,8 +30,7 @@ #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) @@ -41,9 +40,6 @@ nouveau_fence_new(struct nouveau_screen *screen, struct nouveau_fence **fence, (*fence)->ref = 1; LIST_INITHEAD(&(*fence)->work); - if (emit) - nouveau_fence_emit(*fence); - return true; } @@ -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 diff --git a/src/gallium/drivers/nouveau/nouveau_fence.h b/src/gallium/drivers/nouveau/nouveau_fence.h index f10016da826..e14572bce8f 100644 --- a/src/gallium/drivers/nouveau/nouveau_fence.h +++ b/src/gallium/drivers/nouveau/nouveau_fence.h @@ -32,8 +32,7 @@ struct nouveau_fence { void nouveau_fence_emit(struct nouveau_fence *); void nouveau_fence_del(struct nouveau_fence *); -bool nouveau_fence_new(struct nouveau_screen *, struct nouveau_fence **, - bool emit); +bool nouveau_fence_new(struct nouveau_screen *, struct nouveau_fence **); bool nouveau_fence_work(struct nouveau_fence *, void (*)(void *), void *); void nouveau_fence_update(struct nouveau_screen *, bool flushed); void nouveau_fence_next(struct nouveau_screen *); diff --git a/src/gallium/drivers/nouveau/nv30/nv30_screen.c b/src/gallium/drivers/nouveau/nv30/nv30_screen.c index 7dfc0fce73d..56bde4185b5 100644 --- a/src/gallium/drivers/nouveau/nv30/nv30_screen.c +++ b/src/gallium/drivers/nouveau/nv30/nv30_screen.c @@ -735,6 +735,6 @@ nv30_screen_create(struct nouveau_device *dev) nouveau_pushbuf_kick(push, push->channel); - nouveau_fence_new(&screen->base, &screen->base.fence.current, false); + nouveau_fence_new(&screen->base, &screen->base.fence.current); return &screen->base; } diff --git a/src/gallium/drivers/nouveau/nv50/nv50_screen.c b/src/gallium/drivers/nouveau/nv50/nv50_screen.c index f766aadb06c..fcff85d9ed1 100644 --- a/src/gallium/drivers/nouveau/nv50/nv50_screen.c +++ b/src/gallium/drivers/nouveau/nv50/nv50_screen.c @@ -1017,7 +1017,7 @@ nv50_screen_create(struct nouveau_device *dev) goto fail; } - nouveau_fence_new(&screen->base, &screen->base.fence.current, false); + nouveau_fence_new(&screen->base, &screen->base.fence.current); return &screen->base; diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c b/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c index 1ef481b4e4d..ffbe733060c 100644 --- a/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c @@ -1233,7 +1233,7 @@ nvc0_screen_create(struct nouveau_device *dev) screen->default_tsc = CALLOC_STRUCT(nv50_tsc_entry); screen->default_tsc->tsc[0] = G80_TSC_0_SRGB_CONVERSION; - nouveau_fence_new(&screen->base, &screen->base.fence.current, false); + nouveau_fence_new(&screen->base, &screen->base.fence.current); return &screen->base; -- 2.30.2