fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-03 21:40:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

tu: Don't leave tile store CS writeable

Browse source 
A rebase problem meant that the hunk leaving the CS not writeable again
was dropped. This isn't what was intended and caused a crash in the CS
code.

Because tu6_emit_gmem_stores() is now called inside a condition, we have
to move the enable/disable outside of it because changing to a
read-write buffer inside of a condition isn't currently supported.

Fixes: ba9d0ba9a0 ("turnip: Emit tile stores at subpass end time.")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35993>
This commit is contained in:
Connor Abbott 2025-07-07 18:56:22 -04:00 • committed by Marge Bot
parent ad66ebb686
commit 336839bcd8
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/freedreno/vulkan/tu_cmd_buffer.cc
View file

@ -1477,9 +1477,6 @@ tu6_emit_gmem_stores(struct tu_cmd_buffer *cmd,
(!cmd->state.rp.draw_cs_writes_to_cond_pred ||
cs != &cmd->draw_cs);
if (pass->has_fdm)
tu_cs_set_writeable(cs, true);
bool scissor_emitted = false;
/* Resolve should happen before store in case BLIT_EVENT_STORE_AND_CLEAR is
@ -1521,6 +1518,9 @@ tu6_emit_tile_store_cs(struct tu_cmd_buffer *cmd, struct tu_cs *cs)
uint32_t subpass_idx = pass->subpass_count - 1;
const struct tu_subpass *subpass = &pass->subpasses[subpass_idx];
if (pass->has_fdm)
tu_cs_set_writeable(cs, true);
/* We believe setting the marker affects what state HW blocks save/restore
* during preemption. So we only emit it before the stores at the end of the
* last subpass, not other resolves.
@ -1534,6 +1534,10 @@ tu6_emit_tile_store_cs(struct tu_cmd_buffer *cmd, struct tu_cs *cs)
tu6_emit_gmem_stores<CHIP>(cmd, cs, &resolve_group, subpass);
tu_emit_resolve_group<CHIP>(cmd, cs, &resolve_group);
if (pass->has_fdm)
tu_cs_set_writeable(cs, false);
}
void