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

panfrost: Fix race condition in UBO mapping to CPU

Browse source 
In theory, a compute shader (or transform feedback) could write to an
SSBO, rebind as a UBO, and then read as a UBO later in the same frame.
We would need to flush in this case so we don't push stale data to the
later shader. This seems sufficiently obscure, but if this is a
performance issue in a real workload, we could emit a small compute
shader to do the copies without flushing.

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8973>
This commit is contained in:
Alyssa Rosenzweig 2021-02-08 17:49:17 -05:00 • committed by Marge Bot
parent a0b9420915
commit 21c3e82495
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/gallium/drivers/panfrost/pan_cmdstream.c
View file

@ -958,7 +958,8 @@ panfrost_upload_sysvals(struct panfrost_batch *batch, void *buf,
}
static const void *
panfrost_map_constant_buffer_cpu(struct panfrost_constant_buffer *buf,
panfrost_map_constant_buffer_cpu(struct panfrost_context *ctx,
struct panfrost_constant_buffer *buf,
unsigned index)
{
struct pipe_constant_buffer *cb = &buf->cb[index];
@ -966,9 +967,13 @@ panfrost_map_constant_buffer_cpu(struct panfrost_constant_buffer *buf,
if (rsrc)
return rsrc->bo->ptr.cpu;
else if (cb->user_buffer)
else if (cb->user_buffer) {
panfrost_bo_mmap(rsrc->bo);
panfrost_flush_batches_accessing_bo(ctx, rsrc->bo, false);
panfrost_bo_wait(rsrc->bo, INT64_MAX, false);
return cb->user_buffer;
else
} else
unreachable("No constant buffer");
}
@ -1002,7 +1007,7 @@ panfrost_emit_const_buf(struct panfrost_batch *batch,
/* Upload uniforms */
if (has_uniforms && uniform_size) {
const void *cpu = panfrost_map_constant_buffer_cpu(buf, 0);
const void *cpu = panfrost_map_constant_buffer_cpu(ctx, buf, 0);
memcpy(transfer.cpu + sys_size, cpu, uniform_size);
}