Attachment 68755 Details for Bug 55627 – Flush state changes

[patch] Flush state changes

0001-sna-gen4-Presume-we-need-a-flush-upon-state-change-s.patch (text/plain), 3.48 KB, created by Chris Wilson on 2012-10-18 11:44:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Wilson

Created: 2012-10-18 11:44:54 UTC

Size: 3.48 KB

patch

obsolete

>From 257abfdabe39629fb458ed65fab11283f7518dc4 Mon Sep 17 00:00:00 2001
>From: Chris Wilson <chris@chris-wilson.co.uk>
>Date: Wed, 17 Oct 2012 23:34:22 +0100
>Subject: [PATCH] sna/gen4: Presume we need a flush upon state change similar
> to gen5+
>
>References: https://bugs.freedesktop.org/show_bug.cgi?id=55627
>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 |   27 +++++++++++++++++----------
> 1 file changed, 17 insertions(+), 10 deletions(-)
>
>diff --git a/src/sna/gen4_render.c b/src/sna/gen4_render.c
>index ceef528..8dc25d5 100644
>--- a/src/sna/gen4_render.c
>+++ b/src/sna/gen4_render.c
>@@ -190,7 +190,7 @@ static const struct blendinfo {
> #define SAMPLER_OFFSET(sf, se, mf, me, k) \
> 	((((((sf) * EXTEND_COUNT + (se)) * FILTER_COUNT + (mf)) * EXTEND_COUNT + (me)) * KERNEL_COUNT + (k)) * 64)
> 
>-static void
>+static bool
> gen4_emit_pipelined_pointers(struct sna *sna,
> 			     const struct sna_composite_op *op,
> 			     int blend, int kernel);
>@@ -243,6 +243,7 @@ static void gen4_magic_ca_pass(struct sna *sna,
> 	gen4_emit_pipelined_pointers(sna, op, PictOpAdd,
> 				     gen4_choose_composite_kernel(PictOpAdd,
> 								  true, true, op->is_affine));
>+	OUT_BATCH(MI_FLUSH);
> 
> 	OUT_BATCH(GEN4_3DPRIMITIVE |
> 		  GEN4_3DPRIMITIVE_VERTEX_SEQUENTIAL |
>@@ -1222,11 +1223,11 @@ gen4_align_vertex(struct sna *sna, const struct sna_composite_op *op)
> 	}
> }
> 
>-static void
>+static bool
> gen4_emit_binding_table(struct sna *sna, uint16_t offset)
> {
> 	if (sna->render_state.gen4.surface_table == offset)
>-		return;
>+		return false;
> 
> 	sna->render_state.gen4.surface_table = offset;
> 
>@@ -1238,9 +1239,11 @@ gen4_emit_binding_table(struct sna *sna, uint16_t offset)
> 	OUT_BATCH(0);		/* sf */
> 	/* Only the PS uses the binding table */
> 	OUT_BATCH(offset*4);
>+
>+	return true;
> }
> 
>-static void
>+static bool
> gen4_emit_pipelined_pointers(struct sna *sna,
> 			     const struct sna_composite_op *op,
> 			     int blend, int kernel)
>@@ -1263,7 +1266,7 @@ gen4_emit_pipelined_pointers(struct sna *sna,
> 
> 	key = sp | bp << 16;
> 	if (key == sna->render_state.gen4.last_pipelined_pointers)
>-		return;
>+		return true;
> 
> 	OUT_BATCH(GEN4_3DSTATE_PIPELINED_POINTERS | 5);
> 	OUT_BATCH(sna->render_state.gen4.vs);
>@@ -1275,6 +1278,7 @@ gen4_emit_pipelined_pointers(struct sna *sna,
> 
> 	sna->render_state.gen4.last_pipelined_pointers = key;
> 	gen4_emit_urb(sna);
>+	return false;
> }
> 
> static void
>@@ -1376,18 +1380,21 @@ gen4_emit_state(struct sna *sna,
> 		const struct sna_composite_op *op,
> 		uint16_t wm_binding_table)
> {
>+	bool flush = false;
>+
> 	if (FLUSH_EVERY_VERTEX)
> 		OUT_BATCH(MI_FLUSH | MI_INHIBIT_RENDER_CACHE_FLUSH);
> 
> 	gen4_emit_drawing_rectangle(sna, op);
>-	gen4_emit_binding_table(sna, wm_binding_table);
>-	gen4_emit_pipelined_pointers(sna, op, op->op, op->u.gen4.wm_kernel);
>+	flush |= gen4_emit_binding_table(sna, wm_binding_table);
>+	flush |= gen4_emit_pipelined_pointers(sna, op, op->op, op->u.gen4.wm_kernel);
> 	gen4_emit_vertex_elements(sna, op);
> 
>-	if (kgem_bo_is_dirty(op->src.bo) || kgem_bo_is_dirty(op->mask.bo)) {
>-		DBG(("%s: flushing dirty (%d, %d)\n", __FUNCTION__,
>+	if (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)));
>+		     kgem_bo_is_dirty(op->mask.bo),
>+		     flush));
> 		OUT_BATCH(MI_FLUSH);
> 		kgem_clear_dirty(&sna->kgem);
> 		kgem_bo_mark_dirty(op->dst.bo);
>-- 
>1.7.10.4
>

Actions: View | Splinter Review

Attachments on bug 55627: 68084 | 68085 | 68732 | 68755

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.