From 50e15e1c6f3b1ef779b8ce12b7cdbcfeecacef8a Mon Sep 17 00:00:00 2001 From: Rob Clark Date: Wed, 31 Jul 2019 17:37:57 -0700 Subject: [PATCH] freedreno/a4xx: call fd4_emit_ib() directly from fd4 Signed-off-by: Rob Clark --- src/gallium/drivers/freedreno/a4xx/fd4_emit.c | 6 ------ src/gallium/drivers/freedreno/a4xx/fd4_emit.h | 6 ++++++ src/gallium/drivers/freedreno/a4xx/fd4_gmem.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/gallium/drivers/freedreno/a4xx/fd4_emit.c b/src/gallium/drivers/freedreno/a4xx/fd4_emit.c index ec1420da876..6cf80e6a3f1 100644 --- a/src/gallium/drivers/freedreno/a4xx/fd4_emit.c +++ b/src/gallium/drivers/freedreno/a4xx/fd4_emit.c @@ -912,12 +912,6 @@ fd4_emit_restore(struct fd_batch *batch, struct fd_ringbuffer *ring) fd_hw_query_enable(batch, ring); } -static void -fd4_emit_ib(struct fd_ringbuffer *ring, struct fd_ringbuffer *target) -{ - __OUT_IB(ring, true, target); -} - static void fd4_mem_to_mem(struct fd_ringbuffer *ring, struct pipe_resource *dst, unsigned dst_off, struct pipe_resource *src, unsigned src_off, diff --git a/src/gallium/drivers/freedreno/a4xx/fd4_emit.h b/src/gallium/drivers/freedreno/a4xx/fd4_emit.h index 37c2416bc99..a78d83c5ee6 100644 --- a/src/gallium/drivers/freedreno/a4xx/fd4_emit.h +++ b/src/gallium/drivers/freedreno/a4xx/fd4_emit.h @@ -103,4 +103,10 @@ void fd4_emit_restore(struct fd_batch *batch, struct fd_ringbuffer *ring); void fd4_emit_init(struct pipe_context *pctx); +static inline void +fd4_emit_ib(struct fd_ringbuffer *ring, struct fd_ringbuffer *target) +{ + __OUT_IB(ring, true, target); +} + #endif /* FD4_EMIT_H */ diff --git a/src/gallium/drivers/freedreno/a4xx/fd4_gmem.c b/src/gallium/drivers/freedreno/a4xx/fd4_gmem.c index ac2d1e2a0ab..ef1d8ac1890 100644 --- a/src/gallium/drivers/freedreno/a4xx/fd4_gmem.c +++ b/src/gallium/drivers/freedreno/a4xx/fd4_gmem.c @@ -639,7 +639,7 @@ emit_binning_pass(struct fd_batch *batch) } /* emit IB to binning drawcmds: */ - ctx->emit_ib(ring, batch->binning); + fd4_emit_ib(ring, batch->binning); fd_reset_wfi(batch); fd_wfi(batch, ring); -- 2.30.2