Attachment 73753 Details for Bug 59945 – possible fix

[patch] possible fix

0001-r600g-don-t-emit-WAIT_UNTIL-on-cayman-TN.patch (text/plain), 1.57 KB, created by Alex Deucher on 2013-01-28 03:15:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Deucher

Created: 2013-01-28 03:15:38 UTC

Size: 1.57 KB

patch

obsolete

>From ccfd465b9877b02634deecd17e1b43a7ab03409c Mon Sep 17 00:00:00 2001
>From: Alex Deucher <alexander.deucher@amd.com>
>Date: Sun, 27 Jan 2013 22:13:52 -0500
>Subject: [PATCH] r600g: don't emit WAIT_UNTIL on cayman/TN
>
>It shouldn't be needed and older kernels don't support
>it.
>
>Fixes:
>https://bugs.freedesktop.org/show_bug.cgi?id=59945
>
>Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
>---
> src/gallium/drivers/r600/r600_hw_context.c |    6 ++++--
> 1 files changed, 4 insertions(+), 2 deletions(-)
>
>diff --git a/src/gallium/drivers/r600/r600_hw_context.c b/src/gallium/drivers/r600/r600_hw_context.c
>index e13b502..310c19e 100644
>--- a/src/gallium/drivers/r600/r600_hw_context.c
>+++ b/src/gallium/drivers/r600/r600_hw_context.c
>@@ -683,7 +683,8 @@ void r600_flush_emit(struct r600_context *rctx)
> 	}
> 	if (wait_until) {
> 		/* wait for things to settle */
>-		r600_write_config_reg(cs, R_008040_WAIT_UNTIL, wait_until);
>+		if (rctx->family < CHIP_CAYMAN)
>+			r600_write_config_reg(cs, R_008040_WAIT_UNTIL, wait_until);
> 	}
> 
> 	/* everything is properly flushed */
>@@ -862,7 +863,8 @@ void r600_context_emit_fence(struct r600_context *ctx, struct r600_resource *fen
> 	va = r600_resource_va(&ctx->screen->screen, (void*)fence_bo);
> 	va = va + (offset << 2);
> 
>-	r600_write_config_reg(cs, R_008040_WAIT_UNTIL, S_008040_WAIT_3D_IDLE(1));
>+	if (ctx->family < CHIP_CAYMAN)
>+		r600_write_config_reg(cs, R_008040_WAIT_UNTIL, S_008040_WAIT_3D_IDLE(1));
> 
> 	cs->buf[cs->cdw++] = PKT3(PKT3_EVENT_WRITE_EOP, 4, 0);
> 	cs->buf[cs->cdw++] = EVENT_TYPE(EVENT_TYPE_CACHE_FLUSH_AND_INV_TS_EVENT) | EVENT_INDEX(5);
>-- 
>1.7.7.5
>

Actions: View | Splinter Review

Attachments on bug 59945: 73742 | 73743 | 73744 | 73753

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.