diff options
| author | Rob Clark <[email protected]> | 2015-07-05 20:17:56 -0400 |
|---|---|---|
| committer | Rob Clark <[email protected]> | 2015-07-10 11:57:31 -0400 |
| commit | e44845472a4e04e7b6a82ab6c768f9648729d7e9 (patch) | |
| tree | 454afee6470feb26901f87e8cdf2b2092ff6f59a /src/gallium/drivers | |
| parent | a1a6f007823f203755fb54a1f3b7f53ae6cbfef0 (diff) | |
freedreno/ir3/sched: fixup new instr's block
If we split addr/pred, the original instruction could have originated
from a different block. If we don't fixup the block ptr we hit asserts
later (in debug builds).
NOTE: perhaps we don't want to try to preserve addr/pred reg's across
block boundaries.. this at least needs some thought in case addr/pred
writes end up inside a conditional block..
Signed-off-by: Rob Clark <[email protected]>
Diffstat (limited to 'src/gallium/drivers')
| -rw-r--r-- | src/gallium/drivers/freedreno/ir3/ir3_sched.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gallium/drivers/freedreno/ir3/ir3_sched.c b/src/gallium/drivers/freedreno/ir3/ir3_sched.c index 0cb1589eb4d..2ee325518f7 100644 --- a/src/gallium/drivers/freedreno/ir3/ir3_sched.c +++ b/src/gallium/drivers/freedreno/ir3/ir3_sched.c @@ -477,6 +477,10 @@ sched_block(struct ir3_sched_ctx *ctx, struct ir3_block *block) if (new_instr) { list_del(&new_instr->node); list_addtail(&new_instr->node, &unscheduled_list); + /* the original instr that wrote addr/pred may have + * originated from a different block: + */ + new_instr->block = block; } } else { |