Attachment 113251 Details for Bug 73528 – patch

[patch] patch

0001-some-hacks.patch (text/plain), 4.21 KB, created by Marek Olšák on 2015-02-07 13:28:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marek Olšák

Created: 2015-02-07 13:28:12 UTC

Size: 4.21 KB

patch

obsolete

>From cb20bf921ab8deb52e999578257c3868161040ef Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= <marek.olsak@amd.com>
>Date: Sat, 7 Feb 2015 14:26:58 +0100
>Subject: [PATCH] some-hacks
>
>---
> src/gallium/drivers/r600/evergreen_hw_context.c |  9 +++++++--
> src/gallium/drivers/r600/evergreen_state.c      | 20 ++++++-------------
> src/gallium/drivers/r600/r600_hw_context.c      | 26 ++++++++++++-------------
> 3 files changed, 26 insertions(+), 29 deletions(-)
>
>diff --git a/src/gallium/drivers/r600/evergreen_hw_context.c b/src/gallium/drivers/r600/evergreen_hw_context.c
>index 63c2906..e332c64 100644
>--- a/src/gallium/drivers/r600/evergreen_hw_context.c
>+++ b/src/gallium/drivers/r600/evergreen_hw_context.c
>@@ -150,6 +150,11 @@ void evergreen_cp_dma_clear_buffer(struct r600_context *rctx,
> 	/* Invalidate the read caches. */
> 	rctx->b.flags |= R600_CONTEXT_INV_CONST_CACHE |
> 			 R600_CONTEXT_INV_VERTEX_CACHE |
>-			 R600_CONTEXT_INV_TEX_CACHE;
>+			 R600_CONTEXT_INV_TEX_CACHE |
>+			 R600_CONTEXT_FLUSH_AND_INV |
>+			 R600_CONTEXT_FLUSH_AND_INV_CB |
>+			 R600_CONTEXT_FLUSH_AND_INV_DB |
>+			 R600_CONTEXT_FLUSH_AND_INV_CB_META |
>+			 R600_CONTEXT_FLUSH_AND_INV_DB_META |
>+			 R600_CONTEXT_WAIT_CP_DMA_IDLE;
> }
>-
>diff --git a/src/gallium/drivers/r600/evergreen_state.c b/src/gallium/drivers/r600/evergreen_state.c
>index ea58aea..358cfe1 100644
>--- a/src/gallium/drivers/r600/evergreen_state.c
>+++ b/src/gallium/drivers/r600/evergreen_state.c
>@@ -1282,20 +1282,12 @@ static void evergreen_set_framebuffer_state(struct pipe_context *ctx,
> 	struct r600_texture *rtex;
> 	uint32_t i, log_samples;
> 
>-	if (rctx->framebuffer.state.nr_cbufs) {
>-		rctx->b.flags |= R600_CONTEXT_WAIT_3D_IDLE | R600_CONTEXT_FLUSH_AND_INV;
>-		rctx->b.flags |= R600_CONTEXT_FLUSH_AND_INV_CB |
>-				 R600_CONTEXT_FLUSH_AND_INV_CB_META;
>-	}
>-	if (rctx->framebuffer.state.zsbuf) {
>-		rctx->b.flags |= R600_CONTEXT_WAIT_3D_IDLE | R600_CONTEXT_FLUSH_AND_INV;
>-		rctx->b.flags |= R600_CONTEXT_FLUSH_AND_INV_DB;
>-
>-		rtex = (struct r600_texture*)rctx->framebuffer.state.zsbuf->texture;
>-		if (rtex->htile_buffer) {
>-			rctx->b.flags |= R600_CONTEXT_FLUSH_AND_INV_DB_META;
>-		}
>-	}
>+	rctx->b.flags |= R600_CONTEXT_WAIT_3D_IDLE |
>+			 R600_CONTEXT_FLUSH_AND_INV |
>+			 R600_CONTEXT_FLUSH_AND_INV_CB |
>+			 R600_CONTEXT_FLUSH_AND_INV_CB_META |
>+			 R600_CONTEXT_FLUSH_AND_INV_DB |
>+			 R600_CONTEXT_FLUSH_AND_INV_DB_META;
> 
> 	util_copy_framebuffer_state(&rctx->framebuffer.state, state);
> 
>diff --git a/src/gallium/drivers/r600/r600_hw_context.c b/src/gallium/drivers/r600/r600_hw_context.c
>index cd57eed..fa92aba 100644
>--- a/src/gallium/drivers/r600/r600_hw_context.c
>+++ b/src/gallium/drivers/r600/r600_hw_context.c
>@@ -122,11 +122,6 @@ void r600_flush_emit(struct r600_context *rctx)
> 		}
> 	}
> 
>-	if (rctx->b.flags & R600_CONTEXT_PS_PARTIAL_FLUSH) {
>-		cs->buf[cs->cdw++] = PKT3(PKT3_EVENT_WRITE, 0, 0);
>-		cs->buf[cs->cdw++] = EVENT_TYPE(EVENT_TYPE_PS_PARTIAL_FLUSH) | EVENT_INDEX(4);
>-	}
>-
> 	if (rctx->b.chip_class >= R700 &&
> 	    (rctx->b.flags & R600_CONTEXT_FLUSH_AND_INV_CB_META)) {
> 		cs->buf[cs->cdw++] = PKT3(PKT3_EVENT_WRITE, 0, 0);
>@@ -153,6 +148,19 @@ void r600_flush_emit(struct r600_context *rctx)
> 		cs->buf[cs->cdw++] = EVENT_TYPE(EVENT_TYPE_CACHE_FLUSH_AND_INV_EVENT) | EVENT_INDEX(0);
> 	}
> 
>+	if (wait_until) {
>+		/* Use of WAIT_UNTIL is deprecated on Cayman+ */
>+		if (rctx->b.family < CHIP_CAYMAN) {
>+			/* wait for things to settle */
>+			r600_write_config_reg(cs, R_008040_WAIT_UNTIL, wait_until);
>+		}
>+	}
>+
>+	if (rctx->b.flags & R600_CONTEXT_PS_PARTIAL_FLUSH) {
>+		cs->buf[cs->cdw++] = PKT3(PKT3_EVENT_WRITE, 0, 0);
>+		cs->buf[cs->cdw++] = EVENT_TYPE(EVENT_TYPE_PS_PARTIAL_FLUSH) | EVENT_INDEX(4);
>+	}
>+
> 	if (rctx->b.flags & R600_CONTEXT_INV_CONST_CACHE) {
> 		/* Direct constant addressing uses the shader cache.
> 		 * Indirect contant addressing uses the vertex cache. */
>@@ -230,14 +238,6 @@ void r600_flush_emit(struct r600_context *rctx)
> 		cs->buf[cs->cdw++] = 0x0000000A;      /* POLL_INTERVAL */
> 	}
> 
>-	if (wait_until) {
>-		/* Use of WAIT_UNTIL is deprecated on Cayman+ */
>-		if (rctx->b.family < CHIP_CAYMAN) {
>-			/* wait for things to settle */
>-			r600_write_config_reg(cs, R_008040_WAIT_UNTIL, wait_until);
>-		}
>-	}
>-
> 	/* everything is properly flushed */
> 	rctx->b.flags = 0;
> }
>-- 
>2.1.0
>

Actions: View | Splinter Review

Attachments on bug 73528: 99862 | 99863 | 99864 | 109669 | 113251 | 116872 | 117466

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.