diff options
| author | Marek Olšák <[email protected]> | 2017-09-13 02:26:26 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2017-09-26 04:21:14 +0200 |
| commit | 06bfb2d28f7adca7edc6be9c210a7a3583023652 (patch) | |
| tree | a969d20fe1d2a75eb03facabe4c5fb83948178f0 /src/gallium/drivers/radeonsi/cik_sdma.c | |
| parent | e1623da8185ee5d167cd331fb645e6a83961285a (diff) | |
r600: fork and import gallium/radeon
This marks the end of code sharing between r600 and radeonsi.
It's getting difficult to work on radeonsi without breaking r600.
A lot of functions had to be renamed to prevent linker conflicts.
There are also minor cleanups.
Acked-by: Dave Airlie <[email protected]>
Reviewed-by: Nicolai Hähnle <[email protected]>
Diffstat (limited to 'src/gallium/drivers/radeonsi/cik_sdma.c')
| -rw-r--r-- | src/gallium/drivers/radeonsi/cik_sdma.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/gallium/drivers/radeonsi/cik_sdma.c b/src/gallium/drivers/radeonsi/cik_sdma.c index 8154d720dc2..aeaf9cbfe94 100644 --- a/src/gallium/drivers/radeonsi/cik_sdma.c +++ b/src/gallium/drivers/radeonsi/cik_sdma.c @@ -50,7 +50,7 @@ static void cik_sdma_copy_buffer(struct si_context *ctx, src_offset += rsrc->gpu_address; ncopy = DIV_ROUND_UP(size, CIK_SDMA_COPY_MAX_SIZE); - r600_need_dma_space(&ctx->b, ncopy * 7, rdst, rsrc); + si_need_dma_space(&ctx->b, ncopy * 7, rdst, rsrc); for (i = 0; i < ncopy; i++) { csize = MIN2(size, CIK_SDMA_COPY_MAX_SIZE); @@ -95,7 +95,7 @@ static void cik_sdma_clear_buffer(struct pipe_context *ctx, /* the same maximum size as for copying */ ncopy = DIV_ROUND_UP(size, CIK_SDMA_COPY_MAX_SIZE); - r600_need_dma_space(&sctx->b, ncopy * 5, rdst, NULL); + si_need_dma_space(&sctx->b, ncopy * 5, rdst, NULL); for (i = 0; i < ncopy; i++) { csize = MIN2(size, CIK_SDMA_COPY_MAX_SIZE); @@ -194,7 +194,7 @@ static bool cik_sdma_copy_texture(struct si_context *sctx, src_slice_pitch * bpp * (srcz + src_box->depth) <= rsrc->resource.buf->size); - if (!r600_prepare_for_dma_blit(&sctx->b, rdst, dst_level, dstx, dsty, + if (!si_prepare_for_dma_blit(&sctx->b, rdst, dst_level, dstx, dsty, dstz, rsrc, src_level, src_box)) return false; @@ -235,7 +235,7 @@ static bool cik_sdma_copy_texture(struct si_context *sctx, srcy + copy_height != (1 << 14)))) { struct radeon_winsys_cs *cs = sctx->b.dma.cs; - r600_need_dma_space(&sctx->b, 13, &rdst->resource, &rsrc->resource); + si_need_dma_space(&sctx->b, 13, &rdst->resource, &rsrc->resource); radeon_emit(cs, CIK_SDMA_PACKET(CIK_SDMA_OPCODE_COPY, CIK_SDMA_COPY_SUB_OPCODE_LINEAR_SUB_WINDOW, 0) | @@ -398,7 +398,7 @@ static bool cik_sdma_copy_texture(struct si_context *sctx, struct radeon_winsys_cs *cs = sctx->b.dma.cs; uint32_t direction = linear == rdst ? 1u << 31 : 0; - r600_need_dma_space(&sctx->b, 14, &rdst->resource, &rsrc->resource); + si_need_dma_space(&sctx->b, 14, &rdst->resource, &rsrc->resource); radeon_emit(cs, CIK_SDMA_PACKET(CIK_SDMA_OPCODE_COPY, CIK_SDMA_COPY_SUB_OPCODE_TILED_SUB_WINDOW, 0) | @@ -492,7 +492,7 @@ static bool cik_sdma_copy_texture(struct si_context *sctx, dstx + copy_width != (1 << 14)))) { struct radeon_winsys_cs *cs = sctx->b.dma.cs; - r600_need_dma_space(&sctx->b, 15, &rdst->resource, &rsrc->resource); + si_need_dma_space(&sctx->b, 15, &rdst->resource, &rsrc->resource); radeon_emit(cs, CIK_SDMA_PACKET(CIK_SDMA_OPCODE_COPY, CIK_SDMA_COPY_SUB_OPCODE_T2T_SUB_WINDOW, 0)); |