Mesa (master): radeonsi: flush the dma ring in si_flush_from_st

[Marek Olšák]

Module: Mesa
Branch: master
Commit: f9901f1ab284563c9f3e3ab1d6b6ebfd6cd5575e
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f9901f1ab284563c9f3e3ab1d6b6ebfd6cd5575e

Author: Niels Ole Salscheider <niels_ole at salscheider-online.de>
Date:   Thu Mar 13 20:07:14 2014 +0100

radeonsi: flush the dma ring in si_flush_from_st

Signed-off-by: Niels Ole Salscheider <niels_ole at salscheider-online.de>
Signed-off-by: Marek Olšák <marek.olsak at amd.com>

---

 src/gallium/drivers/radeonsi/si_pipe.c |    7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c
index 827e9fe..401bf6a 100644
--- a/src/gallium/drivers/radeonsi/si_pipe.c
+++ b/src/gallium/drivers/radeonsi/si_pipe.c
@@ -65,6 +65,13 @@ static void si_flush_from_st(struct pipe_context *ctx,
 			     struct pipe_fence_handle **fence,
 			     unsigned flags)
 {
+	struct si_context *sctx = (struct si_context *)ctx;
+
+	if (sctx->b.rings.dma.cs) {
+		sctx->b.rings.dma.flush(sctx,
+					flags & PIPE_FLUSH_END_OF_FRAME ? RADEON_FLUSH_END_OF_FRAME : 0);
+	}
+
 	si_flush(ctx, fence,
 		 flags & PIPE_FLUSH_END_OF_FRAME ? RADEON_FLUSH_END_OF_FRAME : 0);
 }