diff options
author | Christian König <christian.koenig@amd.com> | 2014-07-09 14:38:06 +0200 |
---|---|---|
committer | Carl Worth <cworth@cworth.org> | 2014-07-31 15:22:49 -0700 |
commit | c66da3d45761f8776c08aa7f29ef2efd6bb635d3 (patch) | |
tree | a28453d0e270592702c8064a0fb4ce28cc6cb51b | |
parent | f75dfcee1058d77670d85e047c3ef1e102011a2f (diff) |
radeonsi: fix order of r600_need_dma_space and r600_context_bo_reloc
Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
(cherry picked from commit c8011c1885003b79c9f0c6530e46ae6cb0e69575)
-rw-r--r-- | src/gallium/drivers/radeonsi/si_dma.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gallium/drivers/radeonsi/si_dma.c b/src/gallium/drivers/radeonsi/si_dma.c index dc8c609b8d9..26f1e1b63ad 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); |