Revert "sna: Cleanup composite redirection after substituting the BLT"

This reverts commit 5a5212117e.

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

@@ -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;
 	}
 

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;

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;

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;

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;

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;