diff options
Diffstat (limited to 'src/gallium/drivers')
| -rw-r--r-- | src/gallium/drivers/r300/r300_context.c | 4 | ||||
| -rw-r--r-- | src/gallium/drivers/r600/r600_pipe.c | 11 | ||||
| -rw-r--r-- | src/gallium/drivers/radeon/r600_pipe_common.c | 5 | ||||
| -rw-r--r-- | src/gallium/drivers/radeon/radeon_uvd.c | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/radeon/radeon_vce.c | 3 | ||||
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_pipe.c | 5 |
6 files changed, 14 insertions, 16 deletions
diff --git a/src/gallium/drivers/r300/r300_context.c b/src/gallium/drivers/r300/r300_context.c index e28dbfb4034..0116d6c0683 100644 --- a/src/gallium/drivers/r300/r300_context.c +++ b/src/gallium/drivers/r300/r300_context.c @@ -379,7 +379,7 @@ struct pipe_context* r300_create_context(struct pipe_screen* screen, sizeof(struct pipe_transfer), 64, UTIL_SLAB_SINGLETHREADED); - r300->cs = rws->cs_create(rws, RING_GFX, NULL); + r300->cs = rws->cs_create(rws, RING_GFX, r300_flush_callback, r300, NULL); if (r300->cs == NULL) goto fail; @@ -420,8 +420,6 @@ struct pipe_context* r300_create_context(struct pipe_screen* screen, goto fail; r300->blitter->draw_rectangle = r300_blitter_draw_rectangle; - rws->cs_set_flush_callback(r300->cs, r300_flush_callback, r300); - /* The KIL opcode needs the first texture unit to be enabled * on r3xx-r4xx. In order to calm down the CS checker, we bind this * dummy texture there. */ diff --git a/src/gallium/drivers/r600/r600_pipe.c b/src/gallium/drivers/r600/r600_pipe.c index 6b2fcaf9bb4..677f414226d 100644 --- a/src/gallium/drivers/r600/r600_pipe.c +++ b/src/gallium/drivers/r600/r600_pipe.c @@ -167,6 +167,7 @@ static struct pipe_context *r600_create_context(struct pipe_screen *screen, void { struct r600_context *rctx = CALLOC_STRUCT(r600_context); struct r600_screen* rscreen = (struct r600_screen *)screen; + struct radeon_winsys *ws = rscreen->b.ws; if (rctx == NULL) return NULL; @@ -231,13 +232,11 @@ static struct pipe_context *r600_create_context(struct pipe_screen *screen, void goto fail; } - if (rscreen->b.trace_bo) { - rctx->b.rings.gfx.cs = rctx->b.ws->cs_create(rctx->b.ws, RING_GFX, rscreen->b.trace_bo->cs_buf); - } else { - rctx->b.rings.gfx.cs = rctx->b.ws->cs_create(rctx->b.ws, RING_GFX, NULL); - } + rctx->b.rings.gfx.cs = ws->cs_create(ws, RING_GFX, + r600_flush_gfx_ring, rctx, + rscreen->b.trace_bo ? + rscreen->b.trace_bo->cs_buf : NULL); rctx->b.rings.gfx.flush = r600_flush_gfx_ring; - rctx->b.ws->cs_set_flush_callback(rctx->b.rings.gfx.cs, r600_flush_gfx_ring, rctx); rctx->b.rings.gfx.flushing = false; rctx->allocator_fetch_shader = u_suballocator_create(&rctx->b.b, 64 * 1024, 256, diff --git a/src/gallium/drivers/radeon/r600_pipe_common.c b/src/gallium/drivers/radeon/r600_pipe_common.c index c5e85f52a00..efb78cf0caa 100644 --- a/src/gallium/drivers/radeon/r600_pipe_common.c +++ b/src/gallium/drivers/radeon/r600_pipe_common.c @@ -109,9 +109,10 @@ bool r600_common_context_init(struct r600_common_context *rctx, return false; if (rscreen->info.r600_has_dma && !(rscreen->debug_flags & DBG_NO_ASYNC_DMA)) { - rctx->rings.dma.cs = rctx->ws->cs_create(rctx->ws, RING_DMA, NULL); + rctx->rings.dma.cs = rctx->ws->cs_create(rctx->ws, RING_DMA, + r600_flush_dma_from_winsys, + rctx, NULL); rctx->rings.dma.flush = r600_flush_dma_ring; - rctx->ws->cs_set_flush_callback(rctx->rings.dma.cs, r600_flush_dma_from_winsys, rctx); } return true; diff --git a/src/gallium/drivers/radeon/radeon_uvd.c b/src/gallium/drivers/radeon/radeon_uvd.c index 6c54cee4a40..88573c1a941 100644 --- a/src/gallium/drivers/radeon/radeon_uvd.c +++ b/src/gallium/drivers/radeon/radeon_uvd.c @@ -806,7 +806,7 @@ struct pipe_video_codec *ruvd_create_decoder(struct pipe_context *context, dec->set_dtb = set_dtb; dec->stream_handle = rvid_alloc_stream_handle(); dec->ws = ws; - dec->cs = ws->cs_create(ws, RING_UVD, NULL); + dec->cs = ws->cs_create(ws, RING_UVD, NULL, NULL, NULL); if (!dec->cs) { RVID_ERR("Can't get command submission context.\n"); goto error; diff --git a/src/gallium/drivers/radeon/radeon_vce.c b/src/gallium/drivers/radeon/radeon_vce.c index a7dfcda4816..5778dd1b3bf 100644 --- a/src/gallium/drivers/radeon/radeon_vce.c +++ b/src/gallium/drivers/radeon/radeon_vce.c @@ -308,13 +308,12 @@ struct pipe_video_codec *rvce_create_encoder(struct pipe_context *context, enc->get_buffer = get_buffer; enc->ws = ws; - enc->cs = ws->cs_create(ws, RING_VCE, NULL); + enc->cs = ws->cs_create(ws, RING_VCE, rvce_cs_flush, enc, NULL); if (!enc->cs) { RVID_ERR("Can't get command submission context.\n"); goto error; } - enc->ws->cs_set_flush_callback(enc->cs, rvce_cs_flush, enc); templat.buffer_format = PIPE_FORMAT_NV12; templat.chroma_format = PIPE_VIDEO_CHROMA_FORMAT_420; templat.width = enc->base.width; diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c index ec03d6c232c..bd7670d07be 100644 --- a/src/gallium/drivers/radeonsi/si_pipe.c +++ b/src/gallium/drivers/radeonsi/si_pipe.c @@ -122,6 +122,7 @@ static struct pipe_context *si_create_context(struct pipe_screen *screen, void * { struct si_context *sctx = CALLOC_STRUCT(si_context); struct si_screen* sscreen = (struct si_screen *)screen; + struct radeon_winsys *ws = sscreen->b.ws; int shader, i; if (sctx == NULL) @@ -147,9 +148,9 @@ static struct pipe_context *si_create_context(struct pipe_screen *screen, void * sctx->b.b.create_video_buffer = vl_video_buffer_create; } - sctx->b.rings.gfx.cs = sctx->b.ws->cs_create(sctx->b.ws, RING_GFX, NULL); + sctx->b.rings.gfx.cs = ws->cs_create(ws, RING_GFX, si_flush_gfx_ring, + sctx, NULL); sctx->b.rings.gfx.flush = si_flush_gfx_ring; - sctx->b.ws->cs_set_flush_callback(sctx->b.rings.gfx.cs, si_flush_gfx_ring, sctx); si_init_all_descriptors(sctx); |