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

iris: wait for imported fences to be available in iris_fence_await

Browse source 
This ensures shared fence is available before we submit (and fail)
a batch with it, this fixes following issue on iris driver:
https://gitlab.freedesktop.org/mesa/mesa/-/issues/12650

Cc: mesa-stable
Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: José Roberto de Souza <jose.souza@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33662>
(cherry picked from commit 41a7b58214)
This commit is contained in:
Tapani Pälli 2025-02-21 09:01:20 +02:00 • committed by Eric Engestrom
parent 3630721dc8
commit f8e7fecd7e
2 changed files with 28 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -1094,7 +1094,7 @@
"description": "iris: wait for imported fences to be available in iris_fence_await",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": null,
"notes": null

27
src/gallium/drivers/iris/iris_fence.c
View file

@ -307,6 +307,20 @@ iris_fence_flush(struct pipe_context *ctx,
*out_fence = fence;
}
static int
syncobj_wait_available(int drm_fd, uint32_t handle)
{
struct drm_syncobj_timeline_wait wait_args = {
.handles = (uintptr_t) &handle,
.timeout_nsec = INT64_MAX,
.count_handles = 1,
/* Wait for fence to materialize. */
.flags = DRM_SYNCOBJ_WAIT_FLAGS_WAIT_AVAILABLE,
};
return intel_ioctl(drm_fd, DRM_IOCTL_SYNCOBJ_TIMELINE_WAIT, &wait_args);
}
static void
iris_fence_await(struct pipe_context *ctx,
struct pipe_fence_handle *fence)
@ -336,6 +350,19 @@ iris_fence_await(struct pipe_context *ctx,
if (iris_fine_fence_signaled(fine))
continue;
/* For imported fence, wait for fence to be available to make
* sure we can safely submit a batch with it.
*/
if (fine->seqno == UINT32_MAX) {
const struct iris_screen *screen =
(struct iris_screen *)ice->ctx.screen;
struct iris_bufmgr *bufmgr = screen->bufmgr;
if (syncobj_wait_available(iris_bufmgr_get_fd(bufmgr),
fine->syncobj->handle)) {
fprintf(stderr, "error waiting for syncobj: %s\n", strerror(errno));
}
}
iris_foreach_batch(ice, batch) {
/* We're going to make any future work in this batch wait for our
* fence to have gone by. But any currently queued work doesn't