From 2f94de2372139864318b062008e5b51890829953 Mon Sep 17 00:00:00 2001 From: Rob Clark Date: Wed, 31 Jul 2019 17:43:32 -0700 Subject: [PATCH] freedreno/a2xx: call fd2_emit_ib() directly from fd2 Signed-off-by: Rob Clark --- src/gallium/drivers/freedreno/a2xx/fd2_emit.c | 6 ------ src/gallium/drivers/freedreno/a2xx/fd2_emit.h | 6 ++++++ src/gallium/drivers/freedreno/a2xx/fd2_gmem.c | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/gallium/drivers/freedreno/a2xx/fd2_emit.c b/src/gallium/drivers/freedreno/a2xx/fd2_emit.c index 76fd7dee9d7..03329dc9591 100644 --- a/src/gallium/drivers/freedreno/a2xx/fd2_emit.c +++ b/src/gallium/drivers/freedreno/a2xx/fd2_emit.c @@ -563,12 +563,6 @@ fd2_emit_restore(struct fd_context *ctx, struct fd_ringbuffer *ring) A2XX_PA_CL_VTE_CNTL_VPORT_Z_OFFSET_ENA); } -static void -fd2_emit_ib(struct fd_ringbuffer *ring, struct fd_ringbuffer *target) -{ - __OUT_IB(ring, false, target); -} - void fd2_emit_init(struct pipe_context *pctx) { diff --git a/src/gallium/drivers/freedreno/a2xx/fd2_emit.h b/src/gallium/drivers/freedreno/a2xx/fd2_emit.h index 891ed91e5a8..f1676532ad5 100644 --- a/src/gallium/drivers/freedreno/a2xx/fd2_emit.h +++ b/src/gallium/drivers/freedreno/a2xx/fd2_emit.h @@ -46,4 +46,10 @@ void fd2_emit_restore(struct fd_context *ctx, struct fd_ringbuffer *ring); void fd2_emit_init(struct pipe_context *pctx); +static inline void +fd2_emit_ib(struct fd_ringbuffer *ring, struct fd_ringbuffer *target) +{ + __OUT_IB(ring, false, target); +} + #endif /* FD2_EMIT_H */ diff --git a/src/gallium/drivers/freedreno/a2xx/fd2_gmem.c b/src/gallium/drivers/freedreno/a2xx/fd2_gmem.c index 20c6b8bbdca..34595ecbc8f 100644 --- a/src/gallium/drivers/freedreno/a2xx/fd2_gmem.c +++ b/src/gallium/drivers/freedreno/a2xx/fd2_gmem.c @@ -221,7 +221,7 @@ prepare_tile_fini_ib(struct fd_batch *batch) static void fd2_emit_tile_gmem2mem(struct fd_batch *batch, struct fd_tile *tile) { - batch->ctx->emit_ib(batch->gmem, batch->tile_fini); + fd2_emit_ib(batch->gmem, batch->tile_fini); } /* transfer from system memory to gmem */ @@ -648,7 +648,7 @@ fd2_emit_tile_init(struct fd_batch *batch) OUT_RING(ring, CP_REG(REG_A2XX_VGT_VERTEX_REUSE_BLOCK_CNTL)); OUT_RING(ring, 0); - ctx->emit_ib(ring, batch->binning); + fd2_emit_ib(ring, batch->binning); OUT_PKT3(ring, CP_SET_CONSTANT, 2); OUT_RING(ring, CP_REG(REG_A2XX_VGT_VERTEX_REUSE_BLOCK_CNTL)); -- 2.30.2