Module: Mesa Branch: master Commit: 203ef19f48b6d983dfba383b6a8fcebfe0a02aee URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=203ef19f48b6d983dfba383b6a8fcebfe0a02aee
Author: Marek Olšák <[email protected]> Date: Fri Aug 24 00:28:16 2018 -0400 radeonsi: split si_copy_buffer compute and SDMA will be added into it. Tested-by: Dieter Nützel <[email protected]> --- src/gallium/drivers/radeonsi/si_blit.c | 2 +- src/gallium/drivers/radeonsi/si_cp_dma.c | 33 ++++++++++++++++--------- src/gallium/drivers/radeonsi/si_pipe.c | 3 ++- src/gallium/drivers/radeonsi/si_pipe.h | 8 ++++-- src/gallium/drivers/radeonsi/si_test_dma_perf.c | 4 +-- 5 files changed, 33 insertions(+), 17 deletions(-) diff --git a/src/gallium/drivers/radeonsi/si_blit.c b/src/gallium/drivers/radeonsi/si_blit.c index fcaff80125..8f7aa0815b 100644 --- a/src/gallium/drivers/radeonsi/si_blit.c +++ b/src/gallium/drivers/radeonsi/si_blit.c @@ -910,7 +910,7 @@ void si_resource_copy_region(struct pipe_context *ctx, /* Handle buffers first. */ if (dst->target == PIPE_BUFFER && src->target == PIPE_BUFFER) { - si_copy_buffer(sctx, dst, src, dstx, src_box->x, src_box->width, 0, -1); + si_copy_buffer(sctx, dst, src, dstx, src_box->x, src_box->width); return; } diff --git a/src/gallium/drivers/radeonsi/si_cp_dma.c b/src/gallium/drivers/radeonsi/si_cp_dma.c index ad53682b1b..e85bb9b1ac 100644 --- a/src/gallium/drivers/radeonsi/si_cp_dma.c +++ b/src/gallium/drivers/radeonsi/si_cp_dma.c @@ -433,22 +433,18 @@ static void si_cp_dma_realign_engine(struct si_context *sctx, unsigned size, * * \param user_flags bitmask of SI_CPDMA_* */ -void si_copy_buffer(struct si_context *sctx, - struct pipe_resource *dst, struct pipe_resource *src, - uint64_t dst_offset, uint64_t src_offset, unsigned size, - unsigned user_flags, enum si_cache_policy cache_policy) +void si_cp_dma_copy_buffer(struct si_context *sctx, + struct pipe_resource *dst, struct pipe_resource *src, + uint64_t dst_offset, uint64_t src_offset, unsigned size, + unsigned user_flags, enum si_coherency coher, + enum si_cache_policy cache_policy) { uint64_t main_dst_offset, main_src_offset; unsigned skipped_size = 0; unsigned realign_size = 0; - enum si_coherency coher = SI_COHERENCY_SHADER; bool is_first = true; - if (!size) - return; - - if (cache_policy == -1) - cache_policy = get_cache_policy(sctx, coher); + assert(size); if (dst != src || dst_offset != src_offset) { /* Mark the buffer range of destination as valid (initialized), @@ -527,6 +523,20 @@ void si_copy_buffer(struct si_context *sctx, si_cp_dma_realign_engine(sctx, realign_size, user_flags, coher, cache_policy, &is_first); } +} + +void si_copy_buffer(struct si_context *sctx, + struct pipe_resource *dst, struct pipe_resource *src, + uint64_t dst_offset, uint64_t src_offset, unsigned size) +{ + enum si_coherency coher = SI_COHERENCY_SHADER; + enum si_cache_policy cache_policy = get_cache_policy(sctx, coher); + + if (!size) + return; + + si_cp_dma_copy_buffer(sctx, dst, src, dst_offset, src_offset, size, + 0, coher, cache_policy); if (cache_policy != L2_BYPASS) r600_resource(dst)->TC_L2_dirty = true; @@ -541,7 +551,8 @@ void cik_prefetch_TC_L2_async(struct si_context *sctx, struct pipe_resource *buf { assert(sctx->chip_class >= CIK); - si_copy_buffer(sctx, buf, buf, offset, offset, size, SI_CPDMA_SKIP_ALL, L2_LRU); + si_cp_dma_copy_buffer(sctx, buf, buf, offset, offset, size, + SI_CPDMA_SKIP_ALL, SI_COHERENCY_SHADER, L2_LRU); } static void cik_prefetch_shader_async(struct si_context *sctx, diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c index 8b9159b486..82af9dd1de 100644 --- a/src/gallium/drivers/radeonsi/si_pipe.c +++ b/src/gallium/drivers/radeonsi/si_pipe.c @@ -745,7 +745,8 @@ static void si_test_vmfault(struct si_screen *sscreen) r600_resource(buf)->gpu_address = 0; /* cause a VM fault */ if (sscreen->debug_flags & DBG(TEST_VMFAULT_CP)) { - si_copy_buffer(sctx, buf, buf, 0, 4, 4, 0, -1); + si_cp_dma_copy_buffer(sctx, buf, buf, 0, 4, 4, 0, + SI_COHERENCY_NONE, L2_BYPASS); ctx->flush(ctx, NULL, 0); puts("VM fault test: CP - done."); } diff --git a/src/gallium/drivers/radeonsi/si_pipe.h b/src/gallium/drivers/radeonsi/si_pipe.h index a6f09b65f7..29d7e555a0 100644 --- a/src/gallium/drivers/radeonsi/si_pipe.h +++ b/src/gallium/drivers/radeonsi/si_pipe.h @@ -1127,10 +1127,14 @@ void si_cp_dma_clear_buffer(struct si_context *sctx, struct pipe_resource *dst, void si_clear_buffer(struct si_context *sctx, struct pipe_resource *dst, uint64_t offset, uint64_t size, unsigned value, enum si_coherency coher); +void si_cp_dma_copy_buffer(struct si_context *sctx, + struct pipe_resource *dst, struct pipe_resource *src, + uint64_t dst_offset, uint64_t src_offset, unsigned size, + unsigned user_flags, enum si_coherency coher, + enum si_cache_policy cache_policy); void si_copy_buffer(struct si_context *sctx, struct pipe_resource *dst, struct pipe_resource *src, - uint64_t dst_offset, uint64_t src_offset, unsigned size, - unsigned user_flags, enum si_cache_policy cache_policy); + uint64_t dst_offset, uint64_t src_offset, unsigned size); void cik_prefetch_TC_L2_async(struct si_context *sctx, struct pipe_resource *buf, uint64_t offset, unsigned size); void cik_emit_prefetch_L2(struct si_context *sctx, bool vertex_stage_only); diff --git a/src/gallium/drivers/radeonsi/si_test_dma_perf.c b/src/gallium/drivers/radeonsi/si_test_dma_perf.c index f097a64299..6c04720e96 100644 --- a/src/gallium/drivers/radeonsi/si_test_dma_perf.c +++ b/src/gallium/drivers/radeonsi/si_test_dma_perf.c @@ -178,8 +178,8 @@ void si_test_dma_perf(struct si_screen *sscreen) if (test_cp) { /* CP DMA */ if (is_copy) { - si_copy_buffer(sctx, dst, src, 0, 0, size, 0, - cache_policy); + si_cp_dma_copy_buffer(sctx, dst, src, 0, 0, size, 0, + SI_COHERENCY_NONE, cache_policy); } else { si_cp_dma_clear_buffer(sctx, dst, 0, size, clear_value, SI_COHERENCY_NONE, cache_policy); _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
