Mesa (master): vc4: Mark VPM read setup as impacting VPM reads, not writes.

[Eric Anholt]

Module: Mesa
Branch: master
Commit: f431b4f110946a0f6e3822f870fbcd3d23c8317a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f431b4f110946a0f6e3822f870fbcd3d23c8317a

Author: Eric Anholt <eric at anholt.net>
Date:   Tue Dec  9 14:20:54 2014 -0800

vc4: Mark VPM read setup as impacting VPM reads, not writes.

Fixes assertion failures if we adjust scheduling priorities to emphasize
VPM reads more.

---

 src/gallium/drivers/vc4/vc4_qpu_schedule.c |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/gallium/drivers/vc4/vc4_qpu_schedule.c b/src/gallium/drivers/vc4/vc4_qpu_schedule.c
index 6bba66a..4bb9b3a 100644
--- a/src/gallium/drivers/vc4/vc4_qpu_schedule.c
+++ b/src/gallium/drivers/vc4/vc4_qpu_schedule.c
@@ -260,10 +260,16 @@ process_waddr_deps(struct schedule_state *state, struct schedule_node *n,
                         break;
 
                 case QPU_W_VPM:
-                case QPU_W_VPMVCD_SETUP:
                         add_write_dep(state, &state->last_vpm, n);
                         break;
 
+                case QPU_W_VPMVCD_SETUP:
+                        if (is_a)
+                                add_write_dep(state, &state->last_vpm_read, n);
+                        else
+                                add_write_dep(state, &state->last_vpm, n);
+                        break;
+
                 case QPU_W_SFU_RECIP:
                 case QPU_W_SFU_RECIPSQRT:
                 case QPU_W_SFU_EXP: