diff options
| author | Marek Olšák <marek.olsak@amd.com> | 2018-04-01 15:07:58 -0400 |
|---|---|---|
| committer | Marek Olšák <marek.olsak@amd.com> | 2018-04-05 15:34:58 -0400 |
| commit | 2b70dd8c8aad471c7a9ad06ddfe62ab765f7c650 (patch) | |
| tree | 9ef5d770a003bc56210cc45073f625370cb3b753 /src/gallium/drivers/radeonsi/cik_sdma.c | |
| parent | f7de8686de823f523ee53f354063d313f9dcecbe (diff) | |
| download | mesa-2b70dd8c8aad471c7a9ad06ddfe62ab765f7c650.tar.gz mesa-2b70dd8c8aad471c7a9ad06ddfe62ab765f7c650.tar.bz2 mesa-2b70dd8c8aad471c7a9ad06ddfe62ab765f7c650.zip | |
radeonsi: flatten / remove struct r600_ring
Acked-by: Timothy Arceri <tarceri@itsqueeze.com>
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 3e3b9cd4329..75d1927b183 100644 --- a/src/gallium/drivers/radeonsi/cik_sdma.c +++ b/src/gallium/drivers/radeonsi/cik_sdma.c @@ -32,7 +32,7 @@ static void cik_sdma_copy_buffer(struct si_context *ctx, uint64_t src_offset, uint64_t size) { - struct radeon_winsys_cs *cs = ctx->b.dma.cs; + struct radeon_winsys_cs *cs = ctx->b.dma_cs; unsigned i, ncopy, csize; struct r600_resource *rdst = r600_resource(dst); struct r600_resource *rsrc = r600_resource(src); @@ -73,7 +73,7 @@ static void cik_sdma_clear_buffer(struct pipe_context *ctx, unsigned clear_value) { struct si_context *sctx = (struct si_context *)ctx; - struct radeon_winsys_cs *cs = sctx->b.dma.cs; + struct radeon_winsys_cs *cs = sctx->b.dma_cs; unsigned i, ncopy, csize; struct r600_resource *rdst = r600_resource(dst); @@ -230,7 +230,7 @@ static bool cik_sdma_copy_texture(struct si_context *sctx, sctx->b.family != CHIP_KAVERI) || (srcx + copy_width != (1 << 14) && srcy + copy_height != (1 << 14)))) { - struct radeon_winsys_cs *cs = sctx->b.dma.cs; + struct radeon_winsys_cs *cs = sctx->b.dma_cs; si_need_dma_space(&sctx->b, 13, &rdst->resource, &rsrc->resource); @@ -392,7 +392,7 @@ static bool cik_sdma_copy_texture(struct si_context *sctx, copy_width_aligned <= (1 << 14) && copy_height <= (1 << 14) && copy_depth <= (1 << 11)) { - struct radeon_winsys_cs *cs = sctx->b.dma.cs; + struct radeon_winsys_cs *cs = sctx->b.dma_cs; uint32_t direction = linear == rdst ? 1u << 31 : 0; si_need_dma_space(&sctx->b, 14, &rdst->resource, &rsrc->resource); @@ -487,7 +487,7 @@ static bool cik_sdma_copy_texture(struct si_context *sctx, (srcx + copy_width_aligned != (1 << 14) && srcy + copy_height_aligned != (1 << 14) && dstx + copy_width != (1 << 14)))) { - struct radeon_winsys_cs *cs = sctx->b.dma.cs; + struct radeon_winsys_cs *cs = sctx->b.dma_cs; si_need_dma_space(&sctx->b, 15, &rdst->resource, &rsrc->resource); @@ -531,7 +531,7 @@ static void cik_sdma_copy(struct pipe_context *ctx, { struct si_context *sctx = (struct si_context *)ctx; - if (!sctx->b.dma.cs || + if (!sctx->b.dma_cs || src->flags & PIPE_RESOURCE_FLAG_SPARSE || dst->flags & PIPE_RESOURCE_FLAG_SPARSE) goto fallback; |