fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 17:30:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

zink: remove UNSYNCHRONIZED map flag during unmap flush for non-subdata calls

Browse source 
this avoids a scenario where a non-subdata UNSYNCHRONIZED unmap triggers through
tc at the same time the frontend calls an UNSYNCHRONIZED subdata call
in the main thread, which desynchronizes the cmdbuf and hits an assert

Fixes: 8ee0d6dd71 ("zink: add a third cmdbuf for unsynchronized (not reordered) ops")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36846>
This commit is contained in:
Mike Blumenkrantz 2025-08-13 10:20:28 -04:00 • committed by Marge Bot
parent 4d0650d188
commit cf5d41575b
2 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/gallium/drivers/zink/zink_resource.c
View file

@ -2675,6 +2675,7 @@ zink_image_subdata(struct pipe_context *pctx,
struct zink_context *ctx = zink_context(pctx);
struct zink_resource *res = zink_resource(pres);
res->subdata = true;
/* flush clears to avoid subdata conflict */
if (!(usage & TC_TRANSFER_MAP_THREADED_UNSYNC) &&
(res->obj->vkusage & VK_IMAGE_USAGE_HOST_TRANSFER_BIT_EXT))
@ -2746,10 +2747,12 @@ zink_image_subdata(struct pipe_context *pctx,
}
/* make sure image is marked as having data */
res->valid = true;
res->subdata = false;
return;
}
/* fallback case for per-resource unsupported or device-level unsupported */
u_default_texture_subdata(pctx, pres, level, usage, box, data, stride, layer_stride);
res->subdata = false;
}
static void
@ -3038,6 +3041,10 @@ transfer_unmap(struct pipe_context *pctx, struct pipe_transfer *ptrans)
/* flush_region is relative to the mapped region: use only the extents */
struct pipe_box box = ptrans->box;
box.x = box.y = box.z = 0;
/* only subdata calls can potentially trigger an unmap directly from the frontend */
struct zink_resource *res = zink_resource(trans->base.b.resource);
if (!res->subdata)
trans->base.b.usage &= ~PIPE_MAP_UNSYNCHRONIZED;
zink_transfer_flush_region(pctx, ptrans, &box);
}
@ -3092,9 +3099,11 @@ zink_buffer_subdata(struct pipe_context *ctx, struct pipe_resource *buffer,
unsigned usage, unsigned offset, unsigned size, const void *data)
{
struct pipe_transfer *transfer = NULL;
struct zink_resource *res = zink_resource(buffer);
struct pipe_box box;
uint8_t *map = NULL;
res->subdata = true;
usage |= PIPE_MAP_WRITE;
if (!(usage & PIPE_MAP_DIRECTLY))
@ -3102,11 +3111,11 @@ zink_buffer_subdata(struct pipe_context *ctx, struct pipe_resource *buffer,
u_box_1d(offset, size, &box);
map = zink_buffer_map(ctx, buffer, 0, usage, &box, &transfer);
if (!map)
return;
memcpy(map, data, size);
zink_buffer_unmap(ctx, transfer);
if (map) {
memcpy(map, data, size);
zink_buffer_unmap(ctx, transfer);
}
res->subdata = false;
}
static uint64_t

1
src/gallium/drivers/zink/zink_types.h
View file

@ -1305,6 +1305,7 @@ struct zink_resource {
bool copies_warned;
bool swapchain;
bool dmabuf;
bool subdata; //doing subdata call
unsigned dt_stride;
uint8_t modifiers_count;