commit 8a5684d1bd2bdd4fc73ec5008685caab2919fbb0
author Topi Pohjolainen <topi.pohjolainen@intel.com> Wed Mar 15 21:31:07 2017 +0200
committer Andres Gomez <agomez@igalia.com> Wed Mar 29 01:27:43 2017 +0300
tree d76b6fd1141a844bba680fbc00485c9e909bde06
parent 9b66351f5b274f3d79cb2c48afa3b2fcc2bf3442

i965/gen8+: Do full stall when switching pipeline

just as earlier gens do.

CC: "17.0 13.0" <mesa-stable@lists.freedesktop.org>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=96743
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Signed-off-by: Topi Pohjolainen <topi.pohjolainen@intel.com>
(cherry picked from commit bd25d9670b466043cdb5d9668f82accbd587c889)

src/mesa/drivers/dri/i965/brw_misc_state.c

diff --git a/src/mesa/drivers/dri/i965/brw_misc_state.c b/src/mesa/drivers/dri/i965/brw_misc_state.c
index 40a8d07..6ecad82 100644
--- a/src/mesa/drivers/dri/i965/brw_misc_state.c
+++ b/src/mesa/drivers/dri/i965/brw_misc_state.c
@@ -877,8 +877,9 @@
 
          brw->ctx.NewDriverState |= BRW_NEW_CC_STATE;
       }
+   }
 
-   } else if (brw->gen >= 6) {
+   if (brw->gen >= 6) {
       /* From "BXML » GT » MI » vol1a GPU Overview » [Instruction]
        * PIPELINE_SELECT [DevBWR+]":
        *