Mesa (master): radeonsi: really wait for the second EOP event and not the first one

[Marek Olšák]

Module: Mesa
Branch: master
Commit: ad70c3954be0d04ca5c61d3e465ea7622916102f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ad70c3954be0d04ca5c61d3e465ea7622916102f

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Fri Jul 15 16:04:03 2016 +0200

radeonsi: really wait for the second EOP event and not the first one

Reviewed-by: Nicolai Hähnle <nicolai.haehnle at amd.com>

---

 src/gallium/drivers/radeonsi/si_perfcounter.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/gallium/drivers/radeonsi/si_perfcounter.c b/src/gallium/drivers/radeonsi/si_perfcounter.c
index 96007a5..0ced617 100644
--- a/src/gallium/drivers/radeonsi/si_perfcounter.c
+++ b/src/gallium/drivers/radeonsi/si_perfcounter.c
@@ -595,16 +595,19 @@ static void si_pc_emit_stop(struct r600_common_context *ctx,
 		/* Two EOP events are required to make all engines go idle
 		 * (and optional cache flushes executed) before the timestamp
 		 * is written.
+		 *
+		 * Write 1, because we need to wait for the second EOP event.
 		 */
 		radeon_emit(cs, PKT3(PKT3_EVENT_WRITE_EOP, 4, 0));
 		radeon_emit(cs, EVENT_TYPE(EVENT_TYPE_BOTTOM_OF_PIPE_TS) |
 				EVENT_INDEX(5));
 		radeon_emit(cs, va);
 		radeon_emit(cs, (va >> 32) | EOP_DATA_SEL(1));
-		radeon_emit(cs, 0); /* immediate data */
+		radeon_emit(cs, 1); /* immediate data */
 		radeon_emit(cs, 0); /* unused */
 	}
 
+	/* Write 0. */
 	radeon_emit(cs, PKT3(PKT3_EVENT_WRITE_EOP, 4, 0));
 	radeon_emit(cs, EVENT_TYPE(EVENT_TYPE_BOTTOM_OF_PIPE_TS) |
 			EVENT_INDEX(5));
@@ -613,6 +616,7 @@ static void si_pc_emit_stop(struct r600_common_context *ctx,
 	radeon_emit(cs, 0); /* immediate data */
 	radeon_emit(cs, 0); /* unused */
 
+	/* Wait until the memory location is 0. */
 	radeon_emit(cs, PKT3(PKT3_WAIT_REG_MEM, 5, 0));
 	radeon_emit(cs, WAIT_REG_MEM_EQUAL | WAIT_REG_MEM_MEM_SPACE(1));
 	radeon_emit(cs, va);