vc4: Keep sample mask writes from being reordered after TLB writes
authorEric Anholt <eric@anholt.net>
Fri, 18 Dec 2015 19:41:38 +0000 (11:41 -0800)
committerEric Anholt <eric@anholt.net>
Sat, 19 Dec 2015 01:09:03 +0000 (17:09 -0800)
Fixes a regression I noticed after introducing scheduling on the QIR.

Cc: "11.1" <mesa-stable@lists.freedesktop.org>
src/gallium/drivers/vc4/vc4_qpu_schedule.c

index 98b7b6070d79284f8bedc83e5925c00c3b02f608..76cad2e03fefb1a80ebc249ce700c6d979ca4167 100644 (file)
@@ -259,7 +259,8 @@ process_waddr_deps(struct schedule_state *state, struct schedule_node *n,
                 }
         } else if (is_tmu_write(waddr)) {
                 add_write_dep(state, &state->last_tmu_write, n);
-        } else if (qpu_waddr_is_tlb(waddr)) {
+        } else if (qpu_waddr_is_tlb(waddr) ||
+                   waddr == QPU_W_MS_FLAGS) {
                 add_write_dep(state, &state->last_tlb, n);
         } else {
                 switch (waddr) {