radv: replace si_emit_wait_fence() with radv_cp_wait_mem()

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Samuel Pitoiset
2018-10-31 12:00:11 +01:00
parent b1b2dd06a7
commit c571ca7a08
4 changed files with 14 additions and 10 deletions
+9 -5
View File
@@ -725,12 +725,15 @@ void si_cs_emit_write_event_eop(struct radeon_cmdbuf *cs,
}
void
si_emit_wait_fence(struct radeon_cmdbuf *cs,
uint64_t va, uint32_t ref,
uint32_t mask)
radv_cp_wait_mem(struct radeon_cmdbuf *cs, uint32_t op, uint64_t va,
uint32_t ref, uint32_t mask)
{
assert(op == WAIT_REG_MEM_EQUAL ||
op == WAIT_REG_MEM_NOT_EQUAL ||
op == WAIT_REG_MEM_GREATER_OR_EQUAL);
radeon_emit(cs, PKT3(PKT3_WAIT_REG_MEM, 5, false));
radeon_emit(cs, WAIT_REG_MEM_EQUAL | WAIT_REG_MEM_MEM_SPACE(1));
radeon_emit(cs, op | WAIT_REG_MEM_MEM_SPACE(1));
radeon_emit(cs, va);
radeon_emit(cs, va >> 32);
radeon_emit(cs, ref); /* reference value */
@@ -875,7 +878,8 @@ si_cs_emit_cache_flush(struct radeon_cmdbuf *cs,
EOP_DATA_SEL_VALUE_32BIT,
flush_va, old_fence, *flush_cnt,
gfx9_eop_bug_va);
si_emit_wait_fence(cs, flush_va, *flush_cnt, 0xffffffff);
radv_cp_wait_mem(cs, WAIT_REG_MEM_EQUAL, flush_va,
*flush_cnt, 0xffffffff);
}
/* VGT state sync */