diff --git a/.pick_status.json b/.pick_status.json index 87e61a2a972..24ba614d98c 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -894,7 +894,7 @@ "description": "ir3/ra: prevent reusing parent interval of reloaded sources", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "fa22b0901af548d5e1433ad4cdbda314182137c5", "notes": null diff --git a/src/freedreno/ir3/ir3_shared_ra.c b/src/freedreno/ir3/ir3_shared_ra.c index bc890e0b63b..8bf9728b9ae 100644 --- a/src/freedreno/ir3/ir3_shared_ra.c +++ b/src/freedreno/ir3/ir3_shared_ra.c @@ -734,6 +734,10 @@ reload_src(struct ra_ctx *ctx, struct ir3_instruction *instr, interval->physreg_end = best_reg + size; interval->needs_reload = true; ir3_reg_interval_insert(&ctx->reg_ctx, &interval->interval); + + while (interval->interval.parent) + interval = ir3_reg_interval_to_ra_interval(interval->interval.parent); + interval->src = true; }