diff options
| author | Rob Clark <robclark@freedesktop.org> | 2016-04-11 13:03:51 -0400 |
|---|---|---|
| committer | Rob Clark <robclark@freedesktop.org> | 2016-04-13 14:15:13 -0400 |
| commit | f68f6c02466f89decb02e8373c7c3b46a72a621f (patch) | |
| tree | ae9b8dfdba1131b601b46c397ebba06fceed8144 | |
| parent | dd70945e09a348c3aa54675c65c40a284e78c362 (diff) | |
freedreno/ir3: hack to avoid getting stuck in a loop
There are still some edge cases which result in a neighbor-loop. Which
needs to be fixed, but this hack at least makes deqp tests finish.
Signed-off-by: Rob Clark <robclark@freedesktop.org>
| -rw-r--r-- | src/gallium/drivers/freedreno/ir3/ir3.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/gallium/drivers/freedreno/ir3/ir3.h b/src/gallium/drivers/freedreno/ir3/ir3.h index 3859f6a39f3..f68275e568c 100644 --- a/src/gallium/drivers/freedreno/ir3/ir3.h +++ b/src/gallium/drivers/freedreno/ir3/ir3.h @@ -308,8 +308,14 @@ struct ir3_instruction { static inline struct ir3_instruction * ir3_neighbor_first(struct ir3_instruction *instr) { - while (instr->cp.left) + int cnt = 0; + while (instr->cp.left) { instr = instr->cp.left; + if (++cnt > 0xffff) { + debug_assert(0); + break; + } + } return instr; } @@ -322,6 +328,10 @@ static inline int ir3_neighbor_count(struct ir3_instruction *instr) while (instr->cp.right) { num++; instr = instr->cp.right; + if (num > 0xffff) { + debug_assert(0); + break; + } } return num; |