X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fdrivers%2Fradeonsi%2Fsi_fence.c;h=e9dd3e937f25954500182843172c9992bcbcf3f0;hb=cf65c6f0d281bc64c9cea07b7f394036b2eeeaad;hp=6d914a1b1840923f1f01d635ebf9747195d0523b;hpb=2285b9303282c31a3e599e80acda4b589b4a7966;p=mesa.git

diff --git a/src/gallium/drivers/radeonsi/si_fence.c b/src/gallium/drivers/radeonsi/si_fence.c
index 6d914a1b184..e9dd3e937f2 100644
--- a/src/gallium/drivers/radeonsi/si_fence.c
+++ b/src/gallium/drivers/radeonsi/si_fence.c
@@ -180,8 +180,8 @@ static void si_add_fence_dependency(struct si_context *sctx,
 {
 	struct radeon_winsys *ws = sctx->ws;
 
-	if (sctx->dma_cs)
-		ws->cs_add_fence_dependency(sctx->dma_cs, fence, 0);
+	if (sctx->sdma_cs)
+		ws->cs_add_fence_dependency(sctx->sdma_cs, fence, 0);
 	ws->cs_add_fence_dependency(sctx->gfx_cs, fence, 0);
 }
 
@@ -283,10 +283,10 @@ static void si_fine_fence_set(struct si_context *ctx,
 	}
 }
 
-static boolean si_fence_finish(struct pipe_screen *screen,
-			       struct pipe_context *ctx,
-			       struct pipe_fence_handle *fence,
-			       uint64_t timeout)
+static bool si_fence_finish(struct pipe_screen *screen,
+			    struct pipe_context *ctx,
+			    struct pipe_fence_handle *fence,
+			    uint64_t timeout)
 {
 	struct radeon_winsys *rws = ((struct si_screen*)screen)->ws;
 	struct si_multi_fence *sfence = (struct si_multi_fence *)fence;
@@ -513,7 +513,7 @@ static void si_flush_from_st(struct pipe_context *ctx,
 	}
 
 	/* DMA IBs are preambles to gfx IBs, therefore must be flushed first. */
-	if (sctx->dma_cs)
+	if (sctx->sdma_cs)
 		si_flush_dma_cs(sctx, rflags, fence ? &sdma_fence : NULL);
 
 	if (!radeon_emitted(sctx->gfx_cs, sctx->initial_gfx_cs_size)) {
@@ -577,8 +577,8 @@ static void si_flush_from_st(struct pipe_context *ctx,
 	assert(!fine.buf);
 finish:
 	if (!(flags & (PIPE_FLUSH_DEFERRED | PIPE_FLUSH_ASYNC))) {
-		if (sctx->dma_cs)
-			ws->cs_sync_flush(sctx->dma_cs);
+		if (sctx->sdma_cs)
+			ws->cs_sync_flush(sctx->sdma_cs);
 		ws->cs_sync_flush(sctx->gfx_cs);
 	}
 }