From 7bc213a6446e32143e3b478857d23c82d05c3f1d Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Thu, 16 Nov 2017 22:31:27 -0800 Subject: i965: Revert Gen8 aspect of VF PIPE_CONTROL workaround. This apparently causes hangs on Broadwell, so let's back it out for now. I think there are other PIPE_CONTROL workarounds that we're missing. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=103787 (cherry picked from commit a01ba366e01b7d1cdfa6b0e6647536b10c0667ef) --- src/mesa/drivers/dri/i965/brw_pipe_control.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/mesa/drivers/dri/i965/brw_pipe_control.c b/src/mesa/drivers/dri/i965/brw_pipe_control.c index eec4e726343..3013b6ab9db 100644 --- a/src/mesa/drivers/dri/i965/brw_pipe_control.c +++ b/src/mesa/drivers/dri/i965/brw_pipe_control.c @@ -115,7 +115,7 @@ brw_emit_pipe_control(struct brw_context *brw, uint32_t flags, brw_emit_pipe_control_flush(brw, 0); } - if (devinfo->gen >= 8) { + if (devinfo->gen >= 9) { /* THE PIPE_CONTROL "VF Cache Invalidation Enable" docs continue: * * "Project: BDW+ @@ -126,6 +126,10 @@ brw_emit_pipe_control(struct brw_context *brw, uint32_t flags, * * If there's a BO, we're already doing some kind of write. * If not, add a write to the workaround BO. + * + * XXX: This causes GPU hangs on Broadwell, so restrict it to + * Gen9+ for now...see this bug for more information: + * https://bugs.freedesktop.org/show_bug.cgi?id=103787 */ if (!bo) { flags |= PIPE_CONTROL_WRITE_IMMEDIATE; -- cgit v1.2.3