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

st/mesa: allow multiple concurrent waiters in ClientWaitSync

Browse source 
so->fence can be unreferenced by one thread while another thread is
somewhere in ClientWaitSync and expecting so->fence to be non-NULL.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=98172

Cc: 12.0 13.0 <mesa-stable@lists.freedesktop.org>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
This commit is contained in:
Marek Olšák 2016-10-25 13:10:49 +02:00
parent f240ad98bc
commit b687f766fd
1 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/mesa/state_tracker/st_cb_syncobj.c
View file

@ -41,16 +41,21 @@ struct st_sync_object {
struct gl_sync_object b;
struct pipe_fence_handle *fence;
mtx_t mutex; /**< protects "fence" */
};
static struct gl_sync_object * st_new_sync_object(struct gl_context *ctx,
GLenum type)
{
if (type == GL_SYNC_FENCE)
return (struct gl_sync_object*)CALLOC_STRUCT(st_sync_object);
else
if (type == GL_SYNC_FENCE) {
struct st_sync_object *so = CALLOC_STRUCT(st_sync_object);
mtx_init(&so->mutex, mtx_plain);
return &so->b;
} else {
return NULL;
}
}
static void st_delete_sync_object(struct gl_context *ctx,
@ -60,6 +65,7 @@ static void st_delete_sync_object(struct gl_context *ctx,
struct st_sync_object *so = (struct st_sync_object*)obj;
screen->fence_reference(screen, &so->fence, NULL);
mtx_destroy(&so->mutex);
free(so->b.Label);
free(so);
}
@ -83,13 +89,22 @@ static void st_client_wait_sync(struct gl_context *ctx,
struct pipe_context *pipe = st_context(ctx)->pipe;
struct pipe_screen *screen = pipe->screen;
struct st_sync_object *so = (struct st_sync_object*)obj;
struct pipe_fence_handle *fence = NULL;
/* If the fence doesn't exist, assume it's signalled. */
mtx_lock(&so->mutex);
if (!so->fence) {
mtx_unlock(&so->mutex);
so->b.StatusFlag = GL_TRUE;
return;
}
/* We need a local copy of the fence pointer, so that we can call
* fence_finish unlocked.
*/
screen->fence_reference(screen, &fence, so->fence);
mtx_unlock(&so->mutex);
/* Section 4.1.2 of OpenGL 4.5 (Compatibility Profile) says:
* [...] if ClientWaitSync is called and all of the following are true:
* - the SYNC_FLUSH_COMMANDS_BIT bit is set in flags,
@ -102,10 +117,13 @@ static void st_client_wait_sync(struct gl_context *ctx,
* Assume GL_SYNC_FLUSH_COMMANDS_BIT is always set, because applications
* forget to set it.
*/
if (screen->fence_finish(screen, pipe, so->fence, timeout)) {
if (screen->fence_finish(screen, pipe, fence, timeout)) {
mtx_lock(&so->mutex);
screen->fence_reference(screen, &so->fence, NULL);
mtx_unlock(&so->mutex);
so->b.StatusFlag = GL_TRUE;
}
screen->fence_reference(screen, &fence, NULL);
}
static void st_check_sync(struct gl_context *ctx, struct gl_sync_object *obj)