diff options
Diffstat (limited to 'src/gallium/drivers/r600/r600_pipe.c')
| -rw-r--r-- | src/gallium/drivers/r600/r600_pipe.c | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/src/gallium/drivers/r600/r600_pipe.c b/src/gallium/drivers/r600/r600_pipe.c index 88fbdd8d5fd..982e18d47a2 100644 --- a/src/gallium/drivers/r600/r600_pipe.c +++ b/src/gallium/drivers/r600/r600_pipe.c @@ -48,7 +48,6 @@ static const struct debug_named_value r600_debug_options[] = { { "nollvm", DBG_NO_LLVM, "Disable the LLVM shader compiler" }, #endif { "nocpdma", DBG_NO_CP_DMA, "Disable CP DMA" }, - { "nodma", DBG_NO_ASYNC_DMA, "Disable asynchronous DMA" }, /* shader backend */ { "nosb", DBG_NO_SB, "Disable sb backend for graphics shaders" }, @@ -121,20 +120,6 @@ static void r600_flush_gfx_ring(void *ctx, unsigned flags) r600_flush((struct pipe_context*)ctx, flags); } -static void r600_flush_dma_ring(void *ctx, unsigned flags) -{ - struct r600_context *rctx = (struct r600_context *)ctx; - struct radeon_winsys_cs *cs = rctx->b.rings.dma.cs; - - if (!cs->cdw) { - return; - } - - rctx->b.rings.dma.flushing = true; - rctx->b.ws->cs_flush(cs, flags, 0); - rctx->b.rings.dma.flushing = false; -} - static void r600_flush_from_winsys(void *ctx, unsigned flags) { struct r600_context *rctx = (struct r600_context *)ctx; @@ -142,13 +127,6 @@ static void r600_flush_from_winsys(void *ctx, unsigned flags) rctx->b.rings.gfx.flush(rctx, flags); } -static void r600_flush_dma_from_winsys(void *ctx, unsigned flags) -{ - struct r600_context *rctx = (struct r600_context *)ctx; - - rctx->b.rings.dma.flush(rctx, flags); -} - static void r600_destroy_context(struct pipe_context *context) { struct r600_context *rctx = (struct r600_context *)context; @@ -269,14 +247,6 @@ static struct pipe_context *r600_create_context(struct pipe_screen *screen, void rctx->b.ws->cs_set_flush_callback(rctx->b.rings.gfx.cs, r600_flush_from_winsys, rctx); rctx->b.rings.gfx.flushing = false; - rctx->b.rings.dma.cs = NULL; - if (rscreen->b.info.r600_has_dma && !(rscreen->b.debug_flags & DBG_NO_ASYNC_DMA)) { - rctx->b.rings.dma.cs = rctx->b.ws->cs_create(rctx->b.ws, RING_DMA, NULL); - rctx->b.rings.dma.flush = r600_flush_dma_ring; - rctx->b.ws->cs_set_flush_callback(rctx->b.rings.dma.cs, r600_flush_dma_from_winsys, rctx); - rctx->b.rings.dma.flushing = false; - } - rctx->allocator_fetch_shader = u_suballocator_create(&rctx->b.b, 64 * 1024, 256, 0, PIPE_USAGE_DEFAULT, FALSE); if (!rctx->allocator_fetch_shader) |