Mesa (master): r600g: fix userspace fences again

Alex Deucher agd5f at kemper.freedesktop.org
Wed Apr 20 10:10:32 PDT 2011


Module: Mesa
Branch: master
Commit: abee17057f52a1b83ab5d7897bc9299e452b5953
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=abee17057f52a1b83ab5d7897bc9299e452b5953

Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Wed Apr 20 13:09:09 2011 -0400

r600g: fix userspace fences again

reinstate b7617346dcff50a66a10c61b95c33682cf629c9e after the
rework in 6067a2a67f9a7aab2aee051469bea8af03747a95.

Signed-off-by: Alex Deucher <alexdeucher at gmail.com>

---

 src/gallium/winsys/r600/drm/r600_hw_context.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/src/gallium/winsys/r600/drm/r600_hw_context.c b/src/gallium/winsys/r600/drm/r600_hw_context.c
index 8e547da..662455b 100644
--- a/src/gallium/winsys/r600/drm/r600_hw_context.c
+++ b/src/gallium/winsys/r600/drm/r600_hw_context.c
@@ -1310,6 +1310,9 @@ void r600_context_flush(struct r600_context *ctx)
 	else
 		r600_context_flush_dest_caches(ctx);
 
+	/* partial flush is needed to avoid lockups on some chips with user fences */
+	ctx->pm4[ctx->pm4_cdwords++] = PKT3(PKT3_EVENT_WRITE, 0, 0);
+	ctx->pm4[ctx->pm4_cdwords++] = EVENT_TYPE(EVENT_TYPE_PS_PARTIAL_FLUSH) | EVENT_INDEX(4);
 	/* emit fence */
 	ctx->pm4[ctx->pm4_cdwords++] = PKT3(PKT3_EVENT_WRITE_EOP, 4, 0);
 	ctx->pm4[ctx->pm4_cdwords++] = EVENT_TYPE(EVENT_TYPE_CACHE_FLUSH_AND_INV_TS_EVENT) | EVENT_INDEX(5);



More information about the mesa-commit mailing list