diff options
| author | Marek Olšák <[email protected]> | 2018-08-02 20:03:03 -0400 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2018-08-14 21:21:09 -0400 |
| commit | bc132d62f9c86b40463d9661673ac2c6009c21af (patch) | |
| tree | a41da531e38ca46c9e42fd6f66430a410a46e299 | |
| parent | cddd7ce3256a62887fc0f401c5c6f3a0ec5c998a (diff) | |
radeonsi: declare coher in si_copy_buffer
Tested-by: Dieter Nützel <[email protected]>
Reviewed-by: Samuel Pitoiset <[email protected]>
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_cp_dma.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/gallium/drivers/radeonsi/si_cp_dma.c b/src/gallium/drivers/radeonsi/si_cp_dma.c index 5e8d752d4e5..68090412088 100644 --- a/src/gallium/drivers/radeonsi/si_cp_dma.c +++ b/src/gallium/drivers/radeonsi/si_cp_dma.c @@ -420,8 +420,9 @@ void si_copy_buffer(struct si_context *sctx, uint64_t main_dst_offset, main_src_offset; unsigned skipped_size = 0; unsigned realign_size = 0; - unsigned tc_l2_flag = get_tc_l2_flag(sctx, SI_COHERENCY_SHADER); - unsigned flush_flags = get_flush_flags(sctx, SI_COHERENCY_SHADER); + enum si_coherency coher = SI_COHERENCY_SHADER; + unsigned tc_l2_flag = get_tc_l2_flag(sctx, coher); + unsigned flush_flags = get_flush_flags(sctx, coher); bool is_first = true; if (!size) @@ -475,8 +476,7 @@ void si_copy_buffer(struct si_context *sctx, si_cp_dma_prepare(sctx, dst, src, byte_count, size + skipped_size + realign_size, - user_flags, SI_COHERENCY_SHADER, &is_first, - &dma_flags); + user_flags, coher, &is_first, &dma_flags); si_emit_cp_dma(sctx, main_dst_offset, main_src_offset, byte_count, dma_flags); @@ -492,8 +492,7 @@ void si_copy_buffer(struct si_context *sctx, si_cp_dma_prepare(sctx, dst, src, skipped_size, skipped_size + realign_size, user_flags, - SI_COHERENCY_SHADER, - &is_first, &dma_flags); + coher, &is_first, &dma_flags); si_emit_cp_dma(sctx, dst_offset, src_offset, skipped_size, dma_flags); @@ -501,8 +500,8 @@ void si_copy_buffer(struct si_context *sctx, /* Finally, realign the engine if the size wasn't aligned. */ if (realign_size) { - si_cp_dma_realign_engine(sctx, realign_size, user_flags, - SI_COHERENCY_SHADER, &is_first); + si_cp_dma_realign_engine(sctx, realign_size, user_flags, coher, + &is_first); } if (tc_l2_flag) |