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

freedreno: Use TC cpu-storage to shadow buffers

Browse source 
We still use the shadow path for non-buffer updates, where TC isn't
playing any tricks.  But for correctness we need to use the cpu-
storage approach, instead of buffer shadowing, otherwise we can race
with the frontend thread for PIPE_MAP_UNSYNCHRONIZED access.

Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/7262
Signed-off-by: Rob Clark <robdclark@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18926>
This commit is contained in:
Rob Clark 2022-09-27 09:52:18 -07:00 • committed by Marge Bot
parent 3aa76e6a05
commit 6dcc524035
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/gallium/drivers/freedreno/freedreno_resource.c
View file

@ -901,8 +901,8 @@ resource_transfer_map(struct pipe_context *pctx, struct pipe_resource *prsc,
/* try shadowing only if it avoids a flush, otherwise staging would
* be better:
*/
if (needs_flush && fd_try_shadow_resource(ctx, rsc, level, box,
DRM_FORMAT_MOD_LINEAR)) {
if (needs_flush && !(usage & TC_TRANSFER_MAP_NO_INVALIDATE) &&
fd_try_shadow_resource(ctx, rsc, level, box, DRM_FORMAT_MOD_LINEAR)) {
needs_flush = busy = false;
ctx->stats.shadow_uploads++;
} else {
@ -1092,6 +1092,9 @@ fd_resource_get_handle(struct pipe_screen *pscreen, struct pipe_context *pctx,
rsc->b.is_shared = true;
if (prsc->target == PIPE_BUFFER)
tc_buffer_disable_cpu_storage(&rsc->b.b);
handle->modifier = fd_resource_modifier(rsc);
DBG("%" PRSC_FMT ", modifier=%" PRIx64, PRSC_ARGS(prsc), handle->modifier);
@ -1159,7 +1162,9 @@ alloc_resource_struct(struct pipe_screen *pscreen,
pipe_reference_init(&rsc->track->reference, 1);
threaded_resource_init(prsc, false);
bool allow_cpu_storage = (tmpl->target == PIPE_BUFFER) &&
(tmpl->width0 < 0x1000);
threaded_resource_init(prsc, allow_cpu_storage);
if (tmpl->target == PIPE_BUFFER)
rsc->b.buffer_id_unique = util_idalloc_mt_alloc(&screen->buffer_ids);
@ -1423,6 +1428,9 @@ fd_resource_from_handle(struct pipe_screen *pscreen,
if (!rsc)
return NULL;
if (tmpl->target == PIPE_BUFFER)
tc_buffer_disable_cpu_storage(&rsc->b.b);
struct fdl_slice *slice = fd_resource_slice(rsc, 0);
struct pipe_resource *prsc = &rsc->b.b;