diff options
| author | Eric Anholt <eric@anholt.net> | 2015-12-18 11:41:38 -0800 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2016-01-08 12:05:26 +0200 |
| commit | 96e931fea1b2511c5f8c85e09f491dc52aeec386 (patch) | |
| tree | 5be6f856e1a5ef40b5ac2e25cc97f66ef9778142 | |
| parent | 48b580d1cc9d49f3ff3479bda34df723da3c7fdd (diff) | |
vc4: Keep sample mask writes from being reordered after TLB writes
Fixes a regression I noticed after introducing scheduling on the QIR.
Cc: "11.1" <mesa-stable@lists.freedesktop.org>
(cherry picked from commit 960f48809ffebca14af27ce9e87eabc04dfe9b84)
| -rw-r--r-- | src/gallium/drivers/vc4/vc4_qpu_schedule.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gallium/drivers/vc4/vc4_qpu_schedule.c b/src/gallium/drivers/vc4/vc4_qpu_schedule.c index 94303d942e..6f71da3d93 100644 --- a/src/gallium/drivers/vc4/vc4_qpu_schedule.c +++ b/src/gallium/drivers/vc4/vc4_qpu_schedule.c @@ -254,7 +254,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) { |