[Mesa-dev] [PATCH mesa 5/8] xa: let ddx handle flush

[Rob Clark]

From: Jerome Glisse <jglisse at redhat.com>

Signed-off-by: Jerome Glisse <jglisse at redhat.com>
---
 src/gallium/state_trackers/xa/xa_composite.c |  1 -
 src/gallium/state_trackers/xa/xa_context.c   | 10 ++--------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/gallium/state_trackers/xa/xa_composite.c b/src/gallium/state_trackers/xa/xa_composite.c
index a6bfa11..abe5be2 100644
--- a/src/gallium/state_trackers/xa/xa_composite.c
+++ b/src/gallium/state_trackers/xa/xa_composite.c
@@ -527,7 +527,6 @@ XA_EXPORT void
 xa_composite_done(struct xa_context *ctx)
 {
     renderer_draw_flush(ctx);
-    xa_context_flush(ctx);
 
     ctx->comp = NULL;
     ctx->has_solid_color = FALSE;
diff --git a/src/gallium/state_trackers/xa/xa_context.c b/src/gallium/state_trackers/xa/xa_context.c
index 07953a4..ccb143a 100644
--- a/src/gallium/state_trackers/xa/xa_context.c
+++ b/src/gallium/state_trackers/xa/xa_context.c
@@ -122,8 +122,6 @@ xa_surface_dma(struct xa_context *ctx,
 			   0, 0, w, h, map, transfer->stride, 0, 0);
 	}
 	pipe->transfer_unmap(pipe, transfer);
-	if (to_surface)
-	    xa_context_flush(ctx);
     }
     return XA_ERR_NONE;
 }
@@ -247,10 +245,8 @@ XA_EXPORT void
 xa_copy_done(struct xa_context *ctx)
 {
     if (!ctx->simple_copy) {
-	   renderer_draw_flush(ctx);
-	   xa_context_flush(ctx);
-    } else
-	xa_context_flush(ctx);
+	renderer_draw_flush(ctx);
+    }
 }
 
 static void
@@ -329,8 +325,6 @@ XA_EXPORT void
 xa_solid_done(struct xa_context *ctx)
 {
     renderer_draw_flush(ctx);
-    xa_context_flush(ctx);
-
     ctx->comp = NULL;
     ctx->has_solid_color = FALSE;
     ctx->num_bound_samplers = 0;
-- 
1.8.1.4