freedreno/a4xx: call fd4_emit_ib() directly from fd4

Signed-off-by: Rob Clark <robdclark@chromium.org>

diff --git a/src/gallium/drivers/freedreno/a4xx/fd4_emit.c b/src/gallium/drivers/freedreno/a4xx/fd4_emit.c
index ec1420da87696317672e37b9d1d2b33cf16aa7f5..6cf80e6a3f1bf2d3cdc326a194f766b48f25bb6b 100644 (file)
--- 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 37c2416bc99eb86fcf67dc89450934529ec2a36e..a78d83c5ee664d584748cec9131074ef6bac88dc 100644 (file)
--- 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 ac2d1e2a0abf531ed54f05725bc96cb5aaec5ade..ef1d8ac1890bf9a6d5849c2b3c21e2dd534f39cf 100644 (file)
--- 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);