Attachment 105679 Details for Bug 83432 – possible fix 2

[patch] possible fix 2

0001-r600g-radeonsi-make-sure-there-s-enough-CS-space-bef.patch (text/plain), 1.95 KB, created by Marek Olšák on 2014-09-03 12:19:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marek Olšák

Created: 2014-09-03 12:19:38 UTC

Size: 1.95 KB

patch

obsolete

>From adfbcc31467e5a810c637f53e909d9f19e1c3aef Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= <marek.olsak@amd.com>
>Date: Wed, 3 Sep 2014 13:58:57 +0200
>Subject: [PATCH] r600g,radeonsi: make sure there's enough CS space before
> resuming queries
>
>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=83432
>
>Cc: mesa-stable@lists.freedesktop.org
>---
> src/gallium/drivers/radeon/r600_query.c | 28 ++++++++++++++++++++++++++++
> 1 file changed, 28 insertions(+)
>
>diff --git a/src/gallium/drivers/radeon/r600_query.c b/src/gallium/drivers/radeon/r600_query.c
>index 503737c..590db13 100644
>--- a/src/gallium/drivers/radeon/r600_query.c
>+++ b/src/gallium/drivers/radeon/r600_query.c
>@@ -807,12 +807,40 @@ void r600_suspend_nontimer_queries(struct r600_common_context *ctx)
> 	assert(ctx->num_cs_dw_nontimer_queries_suspend == 0);
> }
> 
>+static unsigned r600_queries_num_cs_dw_for_resuming(struct r600_common_context *ctx)
>+{
>+	struct r600_query *query;
>+	unsigned num_dw = 0;
>+
>+	LIST_FOR_EACH_ENTRY(query, &ctx->active_nontimer_queries, list) {
>+		/* begin + end */
>+		num_dw += query->num_cs_dw * 2;
>+
>+		/* Workaround for the fact that
>+		 * num_cs_dw_nontimer_queries_suspend is incremented for every
>+		 * resumed query, which raises the bar in need_cs_space for
>+		 * queries about to be resumed.
>+		 */
>+		num_dw += query->num_cs_dw;
>+	}
>+	/* primitives generated query */
>+	num_dw += ctx->streamout.enable_atom.num_dw;
>+	/* guess for ZPASS enable or PERFECT_ZPASS_COUNT enable updates */
>+	num_dw += 13;
>+
>+	return num_dw;
>+}
>+
> void r600_resume_nontimer_queries(struct r600_common_context *ctx)
> {
> 	struct r600_query *query;
> 
> 	assert(ctx->num_cs_dw_nontimer_queries_suspend == 0);
> 
>+	/* Check CS space here. Resuming must not be interrupted by flushes. */
>+	ctx->need_gfx_cs_space(&ctx->b,
>+			       r600_queries_num_cs_dw_for_resuming(ctx), TRUE);
>+
> 	LIST_FOR_EACH_ENTRY(query, &ctx->active_nontimer_queries, list) {
> 		r600_emit_query_begin(ctx, query);
> 	}
>-- 
>1.9.1
>

Actions: View | Splinter Review

Attachments on bug 83432: 105675 | 105678 | 105679

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.