Mesa (master): vc4: Fix a pasteo in scheduling condition flag usage.

Eric Anholt anholt at kemper.freedesktop.org
Mon Jul 4 23:38:50 UTC 2016


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

Author: Eric Anholt <eric at anholt.net>
Date:   Sat Jul  2 15:08:27 2016 -0700

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.

---

 src/gallium/drivers/vc4/vc4_qpu_schedule.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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);
 }




More information about the mesa-commit mailing list