fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-04 03:18:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

asahi: Ensure we always have space for stream links + padding

Browse source 
It seems VDM can overread (maybe it does blockwise transfers?), so we
always need to leave space at the end of encoder buffers to avoid
faults.

Signed-off-by: Asahi Lina <lina@asahilina.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20365>
This commit is contained in:
Asahi Lina 2022-12-09 15:56:26 +09:00 • committed by Marge Bot
parent cea15fe06d
commit 0042f2beb2
1 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/gallium/drivers/asahi/agx_state.c
View file

@ -2039,6 +2039,17 @@ agx_scissor_culls_everything(struct agx_context *ctx)
static void
agx_ensure_cmdbuf_has_space(struct agx_batch *batch, size_t space)
{
/* Assert that we have space for a link tag */
assert((batch->encoder_current + AGX_VDM_STREAM_LINK_LENGTH) <=
batch->encoder_end && "Encoder overflowed");
/* Always leave room for a link tag, in case we run out of space later,
* plus padding because VDM apparently overreads?
*
* 0x200 is not enough. 0x400 seems to work. 0x800 for safety.
*/
space += AGX_VDM_STREAM_LINK_LENGTH + 0x800;
/* If there is room in the command buffer, we're done */
if (likely((batch->encoder_end - batch->encoder_current) >= space))
return;
@ -2204,7 +2215,8 @@ agx_draw_vbo(struct pipe_context *pctx, const struct pipe_draw_info *info,
}
batch->encoder_current = out;
assert(batch->encoder_current <= batch->encoder_end &&
assert((batch->encoder_current + AGX_VDM_STREAM_LINK_LENGTH) <=
batch->encoder_end &&
"Failed to reserve sufficient space in encoder");
ctx->dirty = 0;