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 <robdclark@chromium.org>

diff --git a/src/gallium/drivers/freedreno/a3xx/fd3_emit.c b/src/gallium/drivers/freedreno/a3xx/fd3_emit.c
index 029aeba93ef1e0492e9c3e85e62e42b91aab41e3..568978a8a7b8f499f3fcd8dfa4a5638d8d2cfe0a 100644 (file)
--- 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 a2270cbe18e5ed7fdd00b150ad7c2cb68bfa1dc2..ece4dabadc25088bc9b0caf31d5262a9c532df89 100644 (file)
--- 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 3e1a6212a96fe884b8e467c1c6322ebb6fd20a8e..8bb8b681a280e925913b3744bb86f3855b93f280 100644 (file)
--- 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);