Mesa (master): radeonsi: raise the max size for SDMA buffer copies

[Marek Olšák]

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

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Tue Apr 26 19:10:43 2016 +0200

radeonsi: raise the max size for SDMA buffer copies

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

---

 src/gallium/drivers/radeonsi/cik_sdma.c | 4 ++--
 src/gallium/drivers/radeonsi/sid.h      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/gallium/drivers/radeonsi/cik_sdma.c b/src/gallium/drivers/radeonsi/cik_sdma.c
index ec3446a..88a994e 100644
--- a/src/gallium/drivers/radeonsi/cik_sdma.c
+++ b/src/gallium/drivers/radeonsi/cik_sdma.c
@@ -46,7 +46,7 @@ static void cik_sdma_do_copy_buffer(struct si_context *ctx,
 	dst_offset += r600_resource(dst)->gpu_address;
 	src_offset += r600_resource(src)->gpu_address;
 
-	ncopy = (size + CIK_SDMA_COPY_MAX_SIZE - 1) / CIK_SDMA_COPY_MAX_SIZE;
+	ncopy = DIV_ROUND_UP(size, CIK_SDMA_COPY_MAX_SIZE);
 	r600_need_dma_space(&ctx->b, ncopy * 7);
 
 	radeon_add_to_buffer_list(&ctx->b, &ctx->b.dma, rsrc, RADEON_USAGE_READ,
@@ -55,7 +55,7 @@ static void cik_sdma_do_copy_buffer(struct si_context *ctx,
 			      RADEON_PRIO_SDMA_BUFFER);
 
 	for (i = 0; i < ncopy; i++) {
-		csize = size < CIK_SDMA_COPY_MAX_SIZE ? size : CIK_SDMA_COPY_MAX_SIZE;
+		csize = MIN2(size, CIK_SDMA_COPY_MAX_SIZE);
 		cs->buf[cs->cdw++] = CIK_SDMA_PACKET(CIK_SDMA_OPCODE_COPY,
 						     CIK_SDMA_COPY_SUB_OPCODE_LINEAR,
 						     0);
diff --git a/src/gallium/drivers/radeonsi/sid.h b/src/gallium/drivers/radeonsi/sid.h
index da4f4fa..dcd6372 100644
--- a/src/gallium/drivers/radeonsi/sid.h
+++ b/src/gallium/drivers/radeonsi/sid.h
@@ -9021,7 +9021,7 @@
 #define    CIK_SDMA_PACKET_SEMAPHORE               0x7
 #define    CIK_SDMA_PACKET_CONSTANT_FILL           0xb
 #define    CIK_SDMA_PACKET_SRBM_WRITE              0xe
-#define    CIK_SDMA_COPY_MAX_SIZE                  0x1fffff
+#define    CIK_SDMA_COPY_MAX_SIZE                  0x3fffe0
 
 #endif /* _SID_H */