From 4326eeac97a431d0b82fa13c5b4bcf77fd4627f9 Mon Sep 17 00:00:00 2001 From: Rob Clark Date: Wed, 31 Jul 2019 17:35:11 -0700 Subject: [PATCH] freedreno/a3xx: call fd3_emit_ib() directly from fd3 No reason for the indirection when called from a3xx specific code. Signed-off-by: Rob Clark --- src/gallium/drivers/freedreno/a3xx/fd3_emit.c | 6 ------ src/gallium/drivers/freedreno/a3xx/fd3_emit.h | 6 ++++++ src/gallium/drivers/freedreno/a3xx/fd3_gmem.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/gallium/drivers/freedreno/a3xx/fd3_emit.c b/src/gallium/drivers/freedreno/a3xx/fd3_emit.c index 029aeba93ef..568978a8a7b 100644 --- a/src/gallium/drivers/freedreno/a3xx/fd3_emit.c +++ b/src/gallium/drivers/freedreno/a3xx/fd3_emit.c @@ -945,12 +945,6 @@ fd3_emit_restore(struct fd_batch *batch, struct fd_ringbuffer *ring) fd_hw_query_enable(batch, ring); } -static void -fd3_emit_ib(struct fd_ringbuffer *ring, struct fd_ringbuffer *target) -{ - __OUT_IB(ring, true, target); -} - void fd3_emit_init(struct pipe_context *pctx) { diff --git a/src/gallium/drivers/freedreno/a3xx/fd3_emit.h b/src/gallium/drivers/freedreno/a3xx/fd3_emit.h index a2270cbe18e..ece4dabadc2 100644 --- a/src/gallium/drivers/freedreno/a3xx/fd3_emit.h +++ b/src/gallium/drivers/freedreno/a3xx/fd3_emit.h @@ -94,6 +94,12 @@ void fd3_emit_restore(struct fd_batch *batch, struct fd_ringbuffer *ring); void fd3_emit_init(struct pipe_context *pctx); +static inline void +fd3_emit_ib(struct fd_ringbuffer *ring, struct fd_ringbuffer *target) +{ + __OUT_IB(ring, true, target); +} + static inline void fd3_emit_cache_flush(struct fd_batch *batch, struct fd_ringbuffer *ring) { diff --git a/src/gallium/drivers/freedreno/a3xx/fd3_gmem.c b/src/gallium/drivers/freedreno/a3xx/fd3_gmem.c index 3e1a6212a96..8bb8b681a28 100644 --- a/src/gallium/drivers/freedreno/a3xx/fd3_gmem.c +++ b/src/gallium/drivers/freedreno/a3xx/fd3_gmem.c @@ -868,7 +868,7 @@ emit_binning_pass(struct fd_batch *batch) A3XX_PC_VSTREAM_CONTROL_N(0)); /* emit IB to binning drawcmds: */ - ctx->emit_ib(ring, batch->binning); + fd3_emit_ib(ring, batch->binning); fd_reset_wfi(batch); fd_wfi(batch, ring); -- 2.30.2