sna: Cleanup composite redirection after substituting the BLT

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

6 files changed, 18 insertions, 6 deletions

diff --git a/src/sna/gen2_render.c b/src/sna/gen2_render.c
index d2f6fe74..401d84af 100644
--- a/src/sna/gen2_render.c
+++ b/src/sna/gen2_render.c
@@ -1782,8 +1782,10 @@ gen2_render_composite(struct sna *sna,
 					       src_x, src_y,
 					       width, height,
 					       dst_x, dst_y,
-					       tmp))
+					       tmp)) {
+			sna_render_composite_redirect_done(sna, tmp);
 			return true;
+		}
 		break;
 	}
 
diff --git a/src/sna/gen3_render.c b/src/sna/gen3_render.c
index ab94bdbf..b13b9bf5 100644
--- a/src/sna/gen3_render.c
+++ b/src/sna/gen3_render.c
@@ -2880,8 +2880,10 @@ gen3_render_composite(struct sna *sna,
 					       src_x, src_y,
 					       width, height,
 					       dst_x, dst_y,
-					       tmp))
+					       tmp)) {
+			sna_render_composite_redirect_done(sna, 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 e7328101..7668caa5 100644
--- a/src/sna/gen4_render.c
+++ b/src/sna/gen4_render.c
@@ -2315,8 +2315,10 @@ gen4_render_composite(struct sna *sna,
 					       src_x, src_y,
 					       width, height,
 					       dst_x, dst_y,
-					       tmp))
+					       tmp)) {
+			sna_render_composite_redirect_done(sna, 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 0a7bc515..b24d7427 100644
--- a/src/sna/gen5_render.c
+++ b/src/sna/gen5_render.c
@@ -2330,8 +2330,10 @@ gen5_render_composite(struct sna *sna,
 					       src_x, src_y,
 					       width, height,
 					       dst_x, dst_y,
-					       tmp))
+					       tmp)) {
+			sna_render_composite_redirect_done(sna, 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 56e48ed2..9c99b2ad 100644
--- a/src/sna/gen6_render.c
+++ b/src/sna/gen6_render.c
@@ -2721,8 +2721,10 @@ gen6_render_composite(struct sna *sna,
 					       src_x, src_y,
 					       width, height,
 					       dst_x, dst_y,
-					       tmp))
+					       tmp)) {
+			sna_render_composite_redirect_done(sna, 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 41921d45..b1f17d75 100644
--- a/src/sna/gen7_render.c
+++ b/src/sna/gen7_render.c
@@ -2825,8 +2825,10 @@ gen7_render_composite(struct sna *sna,
 					       src_x, src_y,
 					       width, height,
 					       dst_x, dst_y,
-					       tmp))
+					       tmp)) {
+			sna_render_composite_redirect_done(sna, tmp);
 			return true;
+		}
 
 		gen7_composite_channel_convert(&tmp->src);
 		break;