From 73e574acb85c06386dd59f11401eea43a2895d5a Mon Sep 17 00:00:00 2001 From: Connor Abbott Date: Thu, 5 Mar 2020 17:35:55 +0100 Subject: [PATCH] freedreno: Rename RB_DONE_TS This makes the various cache_flush implementations make more sense. Tested-by: Marge Bot Part-of: --- src/freedreno/computerator/a6xx.c | 2 +- src/freedreno/vulkan/tu_cmd_buffer.c | 2 +- src/gallium/drivers/freedreno/a5xx/fd5_query.c | 4 ++-- src/gallium/drivers/freedreno/a6xx/fd6_emit.c | 2 +- src/gallium/drivers/freedreno/a6xx/fd6_emit.h | 2 +- src/gallium/drivers/freedreno/a6xx/fd6_query.c | 6 +++--- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/freedreno/computerator/a6xx.c b/src/freedreno/computerator/a6xx.c index df09116657c..3484d3636de 100644 --- a/src/freedreno/computerator/a6xx.c +++ b/src/freedreno/computerator/a6xx.c @@ -314,7 +314,7 @@ cache_flush(struct fd_ringbuffer *ring, struct kernel *kernel) struct a6xx_backend *a6xx_backend = to_a6xx_backend(ir3_kernel->backend); unsigned seqno; - seqno = event_write(ring, kernel, CACHE_FLUSH_AND_INV_EVENT, true); + seqno = event_write(ring, kernel, RB_DONE_TS, true); OUT_PKT7(ring, CP_WAIT_REG_MEM, 6); OUT_RING(ring, CP_WAIT_REG_MEM_0_FUNCTION(WRITE_EQ) | diff --git a/src/freedreno/vulkan/tu_cmd_buffer.c b/src/freedreno/vulkan/tu_cmd_buffer.c index 515ef815950..3fe3b17e83b 100644 --- a/src/freedreno/vulkan/tu_cmd_buffer.c +++ b/src/freedreno/vulkan/tu_cmd_buffer.c @@ -1176,7 +1176,7 @@ tu6_cache_flush(struct tu_cmd_buffer *cmd, struct tu_cs *cs) { unsigned seqno; - seqno = tu6_emit_event_write(cmd, cs, CACHE_FLUSH_AND_INV_EVENT, true); + seqno = tu6_emit_event_write(cmd, cs, RB_DONE_TS, true); tu_cs_emit_pkt7(cs, CP_WAIT_REG_MEM, 6); tu_cs_emit(cs, CP_WAIT_REG_MEM_0_FUNCTION(WRITE_EQ) | diff --git a/src/gallium/drivers/freedreno/a5xx/fd5_query.c b/src/gallium/drivers/freedreno/a5xx/fd5_query.c index ac11dbb86ee..254b49696c1 100644 --- a/src/gallium/drivers/freedreno/a5xx/fd5_query.c +++ b/src/gallium/drivers/freedreno/a5xx/fd5_query.c @@ -166,7 +166,7 @@ timestamp_resume(struct fd_acc_query *aq, struct fd_batch *batch) struct fd_ringbuffer *ring = batch->draw; OUT_PKT7(ring, CP_EVENT_WRITE, 4); - OUT_RING(ring, CP_EVENT_WRITE_0_EVENT(CACHE_FLUSH_AND_INV_EVENT) | + OUT_RING(ring, CP_EVENT_WRITE_0_EVENT(RB_DONE_TS) | CP_EVENT_WRITE_0_TIMESTAMP); OUT_RELOCW(ring, query_sample(aq, start)); OUT_RING(ring, 0x00000000); @@ -180,7 +180,7 @@ timestamp_pause(struct fd_acc_query *aq, struct fd_batch *batch) struct fd_ringbuffer *ring = batch->draw; OUT_PKT7(ring, CP_EVENT_WRITE, 4); - OUT_RING(ring, CP_EVENT_WRITE_0_EVENT(CACHE_FLUSH_AND_INV_EVENT) | + OUT_RING(ring, CP_EVENT_WRITE_0_EVENT(RB_DONE_TS) | CP_EVENT_WRITE_0_TIMESTAMP); OUT_RELOCW(ring, query_sample(aq, stop)); OUT_RING(ring, 0x00000000); diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_emit.c b/src/gallium/drivers/freedreno/a6xx/fd6_emit.c index 1793cd1346f..6f74fbd49c6 100644 --- a/src/gallium/drivers/freedreno/a6xx/fd6_emit.c +++ b/src/gallium/drivers/freedreno/a6xx/fd6_emit.c @@ -1399,7 +1399,7 @@ fd6_framebuffer_barrier(struct fd_context *ctx) struct fd_ringbuffer *ring = batch->draw; unsigned seqno; - seqno = fd6_event_write(batch, ring, CACHE_FLUSH_AND_INV_EVENT, true); + seqno = fd6_event_write(batch, ring, RB_DONE_TS, true); OUT_PKT7(ring, CP_WAIT_REG_MEM, 6); OUT_RING(ring, CP_WAIT_REG_MEM_0_FUNCTION(WRITE_EQ) | diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_emit.h b/src/gallium/drivers/freedreno/a6xx/fd6_emit.h index 2314ea718e1..16bb866cdd7 100644 --- a/src/gallium/drivers/freedreno/a6xx/fd6_emit.h +++ b/src/gallium/drivers/freedreno/a6xx/fd6_emit.h @@ -179,7 +179,7 @@ fd6_cache_flush(struct fd_batch *batch, struct fd_ringbuffer *ring) struct fd6_context *fd6_ctx = fd6_context(batch->ctx); unsigned seqno; - seqno = fd6_event_write(batch, ring, CACHE_FLUSH_AND_INV_EVENT, true); + seqno = fd6_event_write(batch, ring, RB_DONE_TS, true); OUT_PKT7(ring, CP_WAIT_REG_MEM, 6); OUT_RING(ring, CP_WAIT_REG_MEM_0_FUNCTION(WRITE_EQ) | diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_query.c b/src/gallium/drivers/freedreno/a6xx/fd6_query.c index d99dd70bde3..d950eea5e80 100644 --- a/src/gallium/drivers/freedreno/a6xx/fd6_query.c +++ b/src/gallium/drivers/freedreno/a6xx/fd6_query.c @@ -166,7 +166,7 @@ timestamp_resume(struct fd_acc_query *aq, struct fd_batch *batch) struct fd_ringbuffer *ring = batch->draw; OUT_PKT7(ring, CP_EVENT_WRITE, 4); - OUT_RING(ring, CP_EVENT_WRITE_0_EVENT(CACHE_FLUSH_AND_INV_EVENT) | + OUT_RING(ring, CP_EVENT_WRITE_0_EVENT(RB_DONE_TS) | CP_EVENT_WRITE_0_TIMESTAMP); OUT_RELOCW(ring, query_sample(aq, start)); OUT_RING(ring, 0x00000000); @@ -180,7 +180,7 @@ time_elapsed_pause(struct fd_acc_query *aq, struct fd_batch *batch) struct fd_ringbuffer *ring = batch->draw; OUT_PKT7(ring, CP_EVENT_WRITE, 4); - OUT_RING(ring, CP_EVENT_WRITE_0_EVENT(CACHE_FLUSH_AND_INV_EVENT) | + OUT_RING(ring, CP_EVENT_WRITE_0_EVENT(RB_DONE_TS) | CP_EVENT_WRITE_0_TIMESTAMP); OUT_RELOCW(ring, query_sample(aq, stop)); OUT_RING(ring, 0x00000000); @@ -209,7 +209,7 @@ static void record_timestamp(struct fd_ringbuffer *ring, struct fd_bo *bo, unsigned offset) { OUT_PKT7(ring, CP_EVENT_WRITE, 4); - OUT_RING(ring, CP_EVENT_WRITE_0_EVENT(CACHE_FLUSH_AND_INV_EVENT) | + OUT_RING(ring, CP_EVENT_WRITE_0_EVENT(RB_DONE_TS) | CP_EVENT_WRITE_0_TIMESTAMP); OUT_RELOCW(ring, bo, offset, 0, 0); OUT_RING(ring, 0x00000000);