freedreno: Rename RB_DONE_TS

This makes the various cache_flush implementations make more sense.

Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4065>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4065>

diff --git a/src/freedreno/computerator/a6xx.c b/src/freedreno/computerator/a6xx.c
index df09116657c2061cf8a6ea2040fbc894094e8ab2..3484d3636de1901c271e5bf4993245259ea89398 100644 (file)
--- 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 515ef81595041262e08526d578312c8da2a83c68..3fe3b17e83baba837282e9d4af4c30a2da794338 100644 (file)
--- 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 ac11dbb86ee55d8f61f27a9556a9dd9a6cfcb738..254b49696c1914971f2c41d67741ccc1a7855c67 100644 (file)
--- 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 1793cd1346f13af9c7436209b9e795517fccc6ef..6f74fbd49c69b62b2b2866890e229eb060af26a7 100644 (file)
--- 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 2314ea718e13d0ae52744d469b803c77e891bbfe..16bb866cdd7e8baf50539322fe9e1368173416ef 100644 (file)
--- 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 d99dd70bde3af6fb927ddc8201ea0e5682b35483..d950eea5e8032481d5390b390329c19183606bb6 100644 (file)
--- 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);