Mesa (master): i965: Apply post-sync non-zero workaround to homebrew workaround.

[Kenneth Graunke]

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

Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Fri Oct 21 01:03:37 2011 -0700

i965: Apply post-sync non-zero workaround to homebrew workaround.

In commit 3e5d3626, Eric added a homebrew workaround to fix GPU hangs in
the Mesa "engine" demo and oglc's api-texcoord test.

Unfortunately, his PIPE_CONTROL contains a Depth Stall, which
necessitates the post-sync non-zero workaround,

Fixes GPU hangs in Civilization 4, PlaneShift, and 3DMMES.
Hopefully Heroes of Newerth as well, though I haven't tested that.

NOTE: This is candidate for the 7.11 branch.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=40324
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=41096
Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-and-tested-by: Eric Anholt <eric at anholt.net>

---

 src/mesa/drivers/dri/i965/gen6_vs_state.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/gen6_vs_state.c b/src/mesa/drivers/dri/i965/gen6_vs_state.c
index 1c57a3b..f2c2e2b 100644
--- a/src/mesa/drivers/dri/i965/gen6_vs_state.c
+++ b/src/mesa/drivers/dri/i965/gen6_vs_state.c
@@ -198,6 +198,8 @@ upload_vs_state(struct brw_context *brw)
     * bug reports that led to this workaround, and may be more than
     * what is strictly required to avoid the issue.
     */
+   intel_emit_post_sync_nonzero_flush(intel);
+
    BEGIN_BATCH(4);
    OUT_BATCH(_3DSTATE_PIPE_CONTROL);
    OUT_BATCH(PIPE_CONTROL_DEPTH_STALL |