From f21079bad6e8316baf5d0295d6e7a809041bce06 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Mon, 27 Aug 2012 11:25:28 +0100
Subject: [PATCH] Revert "sna: Cleanup composite redirection after substituting
 the BLT"

This reverts commit 5a5212117e7a73ce3fffb87c60a505a849e38c36.

The clean up is in effect too early, as this is during preparation and
the actual work is already being correctly done at the end.
---
 src/sna/gen2_render.c | 4 +---
 src/sna/gen3_render.c | 4 +---
 src/sna/gen4_render.c | 4 +---
 src/sna/gen5_render.c | 4 +---
 src/sna/gen6_render.c | 4 +---
 src/sna/gen7_render.c | 4 +---
 6 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/src/sna/gen2_render.c b/src/sna/gen2_render.c
index 401d84af..d2f6fe74 100644
--- a/src/sna/gen2_render.c
+++ b/src/sna/gen2_render.c
@@ -1782,10 +1782,8 @@ gen2_render_composite(struct sna *sna,
 					       src_x, src_y,
 					       width, height,
 					       dst_x, dst_y,
-					       tmp)) {
-			sna_render_composite_redirect_done(sna, tmp);
+					       tmp))
 			return true;
-		}
 		break;
 	}
 
diff --git a/src/sna/gen3_render.c b/src/sna/gen3_render.c
index b13b9bf5..ab94bdbf 100644
--- a/src/sna/gen3_render.c
+++ b/src/sna/gen3_render.c
@@ -2880,10 +2880,8 @@ gen3_render_composite(struct sna *sna,
 					       src_x, src_y,
 					       width, height,
 					       dst_x, dst_y,
-					       tmp)) {
-			sna_render_composite_redirect_done(sna, tmp);
+					       tmp))
 			return true;
-		}
 
 		gen3_composite_channel_convert(&tmp->src);
 		break;
diff --git a/src/sna/gen4_render.c b/src/sna/gen4_render.c
index 7668caa5..e7328101 100644
--- a/src/sna/gen4_render.c
+++ b/src/sna/gen4_render.c
@@ -2315,10 +2315,8 @@ gen4_render_composite(struct sna *sna,
 					       src_x, src_y,
 					       width, height,
 					       dst_x, dst_y,
-					       tmp)) {
-			sna_render_composite_redirect_done(sna, tmp);
+					       tmp))
 			return true;
-		}
 
 		gen4_composite_channel_convert(&tmp->src);
 		break;
diff --git a/src/sna/gen5_render.c b/src/sna/gen5_render.c
index 9a94421d..5eff8719 100644
--- a/src/sna/gen5_render.c
+++ b/src/sna/gen5_render.c
@@ -2333,10 +2333,8 @@ gen5_render_composite(struct sna *sna,
 					       src_x, src_y,
 					       width, height,
 					       dst_x, dst_y,
-					       tmp)) {
-			sna_render_composite_redirect_done(sna, tmp);
+					       tmp))
 			return true;
-		}
 
 		gen5_composite_channel_convert(&tmp->src);
 		break;
diff --git a/src/sna/gen6_render.c b/src/sna/gen6_render.c
index 8eadda7c..6d5a6cec 100644
--- a/src/sna/gen6_render.c
+++ b/src/sna/gen6_render.c
@@ -2710,10 +2710,8 @@ gen6_render_composite(struct sna *sna,
 					       src_x, src_y,
 					       width, height,
 					       dst_x, dst_y,
-					       tmp)) {
-			sna_render_composite_redirect_done(sna, tmp);
+					       tmp))
 			return true;
-		}
 
 		gen6_composite_channel_convert(&tmp->src);
 		break;
diff --git a/src/sna/gen7_render.c b/src/sna/gen7_render.c
index ea05a41b..ffe41cf3 100644
--- a/src/sna/gen7_render.c
+++ b/src/sna/gen7_render.c
@@ -2815,10 +2815,8 @@ gen7_render_composite(struct sna *sna,
 					       src_x, src_y,
 					       width, height,
 					       dst_x, dst_y,
-					       tmp)) {
-			sna_render_composite_redirect_done(sna, tmp);
+					       tmp))
 			return true;
-		}
 
 		gen7_composite_channel_convert(&tmp->src);
 		break;