From: Eric Anholt <eric@anholt.net>
Date: Sat, 2 Jul 2016 22:08:27 +0000 (-0700)
Subject: vc4: Fix a pasteo in scheduling condition flag usage.
X-Git-Tag: upstream/17.1.0~8308
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=44df374a9c91b87be0f5ebccadc52760ebe95871;p=platform%2Fupstream%2Fmesa.git

vc4: Fix a pasteo in scheduling condition flag usage.

Noticed by code inspection.  This hasn't been too big of a deal, because
our cond usages all start out as adder ops, either MOVs or the FTOI for Z
writes.  MOVs *can* get converted to mul ops during scheduling, but
apparently we hadn't hit this.
---

diff --git a/src/gallium/drivers/vc4/vc4_qpu_schedule.c b/src/gallium/drivers/vc4/vc4_qpu_schedule.c
index 09164b7..4af605c 100644
--- a/src/gallium/drivers/vc4/vc4_qpu_schedule.c
+++ b/src/gallium/drivers/vc4/vc4_qpu_schedule.c
@@ -404,7 +404,7 @@ calculate_deps(struct schedule_state *state, struct schedule_node *n)
         }
 
         process_cond_deps(state, n, QPU_GET_FIELD(inst, QPU_COND_ADD));
-        process_cond_deps(state, n, QPU_GET_FIELD(inst, QPU_COND_ADD));
+        process_cond_deps(state, n, QPU_GET_FIELD(inst, QPU_COND_MUL));
         if (inst & QPU_SF)
                 add_write_dep(state, &state->last_sf, n);
 }