summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/mesa/drivers/dri/i965/gen7_urb.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/i965/gen7_urb.c b/src/mesa/drivers/dri/i965/gen7_urb.c
index 2e5f8e60ba..9e12657313 100644
--- a/src/mesa/drivers/dri/i965/gen7_urb.c
+++ b/src/mesa/drivers/dri/i965/gen7_urb.c
@@ -145,8 +145,15 @@ gen7_emit_push_constant_state(struct brw_context *brw, unsigned vs_size,
* in the ring after this instruction.
*
* No such restriction exists for Haswell or Baytrail.
+ *
+ * From the CNL Bspec, Windower -
+ * 3DSTATE_PUSH_CONSTANT_ALLOC_PS/VS/GS/DS/HS:
+ *
+ * This command must be followed by a PIPE_CONTROL with CS Stall bit
+ * set.
*/
- if (devinfo->gen < 8 && !devinfo->is_haswell && !devinfo->is_baytrail)
+ if ((devinfo->gen < 8 && !devinfo->is_haswell && !devinfo->is_baytrail) ||
+ devinfo->gen >= 10)
gen7_emit_cs_stall_flush(brw);
}