Attachment 92512 Details for Bug 55500 – Always force a GPU flush between operations

[patch] Always force a GPU flush between operations

0001-sna-gen4-Add-an-ALWAYS_FLUSH-debugging-option.patch (text/plain), 2.64 KB, created by Chris Wilson on 2014-01-21 10:29:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Wilson

Created: 2014-01-21 10:29:53 UTC

Size: 2.64 KB

patch

obsolete

>From 5234a6ee7fe201c0857f35bfeada67dd8c424ae8 Mon Sep 17 00:00:00 2001
>From: Chris Wilson <chris@chris-wilson.co.uk>
>Date: Fri, 17 Jan 2014 14:33:26 +0000
>Subject: [PATCH] sna/gen4: Add an ALWAYS_FLUSH debugging option
>
>Still gen4 is cursed. This should restore the plateau we reached with
>2.99.907 by forcing a full GPU flush between every operation.
>
>References: https://bugs.freedesktop.org/show_bug.cgi?id=55500
>Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
>---
> src/sna/gen4_render.c |   12 +++++++-----
> 1 file changed, 7 insertions(+), 5 deletions(-)
>
>diff --git a/src/sna/gen4_render.c b/src/sna/gen4_render.c
>index e239c21..720d5c3 100644
>--- a/src/sna/gen4_render.c
>+++ b/src/sna/gen4_render.c
>@@ -54,6 +54,8 @@
> #define FORCE_NONRECTILINEAR_SPANS -1
> #define FORCE_FLUSH 1 /* https://bugs.freedesktop.org/show_bug.cgi?id=55500 */
> 
>+#define ALWAYS_FLUSH 1
>+
> #define NO_COMPOSITE 0
> #define NO_COMPOSITE_SPANS 0
> #define NO_COPY 0
>@@ -584,7 +586,7 @@ gen4_emit_pipe_flush(struct sna *sna)
> inline static void
> gen4_emit_pipe_break(struct sna *sna)
> {
>-#if 1
>+#if !ALWAYS_FLUSH
> 	OUT_BATCH(GEN4_PIPE_CONTROL | (4 - 2));
> 	OUT_BATCH(0);
> 	OUT_BATCH(0);
>@@ -1078,7 +1080,7 @@ gen4_emit_state(struct sna *sna,
> 	flush = wm_binding_table & 1;
> 	wm_binding_table &= ~1;
> 
>-	if (kgem_bo_is_dirty(op->src.bo) || kgem_bo_is_dirty(op->mask.bo)) {
>+	if (ALWAYS_FLUSH || kgem_bo_is_dirty(op->src.bo) || kgem_bo_is_dirty(op->mask.bo)) {
> 		DBG(("%s: flushing dirty (%d, %d), forced? %d\n", __FUNCTION__,
> 		     kgem_bo_is_dirty(op->src.bo),
> 		     kgem_bo_is_dirty(op->mask.bo),
>@@ -1138,7 +1140,7 @@ gen4_bind_surfaces(struct sna *sna,
> 		offset = sna->render_state.gen4.surface_table;
> 	}
> 
>-	if (sna->kgem.batch[sna->render_state.gen4.surface_table] == binding_table[0])
>+	if (!ALWAYS_FLUSH && sna->kgem.batch[sna->render_state.gen4.surface_table] == binding_table[0])
> 		dirty = 0;
> 
> 	gen4_emit_state(sna, op, offset | dirty);
>@@ -1376,7 +1378,7 @@ static void gen4_video_bind_surfaces(struct sna *sna,
> 					       src_surf_format);
> 	}
> 
>-	if (sna->kgem.batch[sna->render_state.gen4.surface_table] == binding_table[0])
>+	if (!ALWAYS_FLUSH && sna->kgem.batch[sna->render_state.gen4.surface_table] == binding_table[0])
> 		dirty = 0;
> 
> 	gen4_emit_state(sna, op, offset | dirty);
>@@ -2322,7 +2324,7 @@ gen4_copy_bind_surfaces(struct sna *sna, const struct sna_composite_op *op)
> 		offset = sna->render_state.gen4.surface_table;
> 	}
> 
>-	if (sna->kgem.batch[sna->render_state.gen4.surface_table] == binding_table[0])
>+	if (!ALWAYS_FLUSH && sna->kgem.batch[sna->render_state.gen4.surface_table] == binding_table[0])
> 		dirty = 0;
> 
> 	gen4_emit_state(sna, op, offset | dirty);
>-- 
>1.7.9.5
>

Actions: View | Splinter Review

Attachments on bug 55500: 67928 | 67929 | 67930 | 68731 | 68756 | 69237 | 69666 | 71490 | 71491 | 71492 | 74207 | 75189 | 82118 | 82127 | 82128 | 82227 | 82369 | 82787 | 82788 | 82789 | 90707 | 91383 | 91388 | 91389 | 91613 | 92240 | 92287 | 92288 | 92512 | 92770 | 93235 | 93326 | 96026 | 96027

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.