Mesa (10.2): radeonsi: fix order of r600_need_dma_space and r600_context_bo_reloc

[Carl Worth]

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

Author: Christian König <christian.koenig at amd.com>
Date:   Wed Jul  9 14:38:06 2014 +0200

radeonsi: fix order of r600_need_dma_space and r600_context_bo_reloc

Signed-off-by: Christian König <christian.koenig at amd.com>
Reviewed-by: Marek Olšák <marek.olsak at amd.com>
(cherry picked from commit c8011c1885003b79c9f0c6530e46ae6cb0e69575)

---

 src/gallium/drivers/radeonsi/si_dma.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/gallium/drivers/radeonsi/si_dma.c b/src/gallium/drivers/radeonsi/si_dma.c
index dc8c609..26f1e1b 100644
--- a/src/gallium/drivers/radeonsi/si_dma.c
+++ b/src/gallium/drivers/radeonsi/si_dma.c
@@ -91,12 +91,13 @@ static void si_dma_copy_buffer(struct si_context *ctx,
 	}
 	ncopy = (size / max_csize) + !!(size % max_csize);
 
+	r600_need_dma_space(&ctx->b, ncopy * 5);
+
 	r600_context_bo_reloc(&ctx->b, &ctx->b.rings.dma, rsrc, RADEON_USAGE_READ,
 			      RADEON_PRIO_MIN);
 	r600_context_bo_reloc(&ctx->b, &ctx->b.rings.dma, rdst, RADEON_USAGE_WRITE,
 			      RADEON_PRIO_MIN);
 
-	r600_need_dma_space(&ctx->b, ncopy * 5);
 	for (i = 0; i < ncopy; i++) {
 		csize = size < max_csize ? size : max_csize;
 		cs->buf[cs->cdw++] = SI_DMA_PACKET(SI_DMA_PACKET_COPY, sub_cmd, csize);