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

freedreno: fix context teardown race

Browse source 
We could still have batches queued up to flush, so fd_context_destroy()
(which will kill and sync on the flush_queue) before deleting buffers
that might be referenced from fdN_gmem() from context of flush_queue.

Signed-off-by: Rob Clark <robdclark@gmail.com>
This commit is contained in:
Rob Clark 2018-08-20 09:55:12 -04:00
parent 5fab32ddad
commit e11e9d6394
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/gallium/drivers/freedreno/a3xx/fd3_context.c
View file

@ -44,6 +44,8 @@ fd3_context_destroy(struct pipe_context *pctx)
{ {
struct fd3_context *fd3_ctx = fd3_context(fd_context(pctx)); struct fd3_context *fd3_ctx = fd3_context(fd_context(pctx));
fd_context_destroy(pctx);
fd_bo_del(fd3_ctx->vs_pvt_mem); fd_bo_del(fd3_ctx->vs_pvt_mem);
fd_bo_del(fd3_ctx->fs_pvt_mem); fd_bo_del(fd3_ctx->fs_pvt_mem);
fd_bo_del(fd3_ctx->vsc_size_mem); fd_bo_del(fd3_ctx->vsc_size_mem);
@ -54,8 +56,6 @@ fd3_context_destroy(struct pipe_context *pctx)
fd_hw_query_fini(pctx); fd_hw_query_fini(pctx);
fd_context_destroy(pctx);
free(fd3_ctx); free(fd3_ctx);
} }

4
src/gallium/drivers/freedreno/a4xx/fd4_context.c
View file

@ -44,6 +44,8 @@ fd4_context_destroy(struct pipe_context *pctx)
{ {
struct fd4_context *fd4_ctx = fd4_context(fd_context(pctx)); struct fd4_context *fd4_ctx = fd4_context(fd_context(pctx));
fd_context_destroy(pctx);
fd_bo_del(fd4_ctx->vs_pvt_mem); fd_bo_del(fd4_ctx->vs_pvt_mem);
fd_bo_del(fd4_ctx->fs_pvt_mem); fd_bo_del(fd4_ctx->fs_pvt_mem);
fd_bo_del(fd4_ctx->vsc_size_mem); fd_bo_del(fd4_ctx->vsc_size_mem);
@ -54,8 +56,6 @@ fd4_context_destroy(struct pipe_context *pctx)
fd_hw_query_fini(pctx); fd_hw_query_fini(pctx);
fd_context_destroy(pctx);
free(fd4_ctx); free(fd4_ctx);
} }

4
src/gallium/drivers/freedreno/a5xx/fd5_context.c
View file

@ -44,6 +44,8 @@ fd5_context_destroy(struct pipe_context *pctx)
{ {
struct fd5_context *fd5_ctx = fd5_context(fd_context(pctx)); struct fd5_context *fd5_ctx = fd5_context(fd_context(pctx));
fd_context_destroy(pctx);
fd_bo_del(fd5_ctx->vs_pvt_mem); fd_bo_del(fd5_ctx->vs_pvt_mem);
fd_bo_del(fd5_ctx->fs_pvt_mem); fd_bo_del(fd5_ctx->fs_pvt_mem);
fd_bo_del(fd5_ctx->vsc_size_mem); fd_bo_del(fd5_ctx->vsc_size_mem);
@ -53,8 +55,6 @@ fd5_context_destroy(struct pipe_context *pctx)
u_upload_destroy(fd5_ctx->border_color_uploader); u_upload_destroy(fd5_ctx->border_color_uploader);
fd_context_destroy(pctx);
free(fd5_ctx); free(fd5_ctx);
} }

4
src/gallium/drivers/freedreno/a6xx/fd6_context.c
View file

@ -43,6 +43,8 @@ fd6_context_destroy(struct pipe_context *pctx)
{ {
struct fd6_context *fd6_ctx = fd6_context(fd_context(pctx)); struct fd6_context *fd6_ctx = fd6_context(fd_context(pctx));
fd_context_destroy(pctx);
fd_bo_del(fd6_ctx->vs_pvt_mem); fd_bo_del(fd6_ctx->vs_pvt_mem);
fd_bo_del(fd6_ctx->fs_pvt_mem); fd_bo_del(fd6_ctx->fs_pvt_mem);
fd_bo_del(fd6_ctx->vsc_size_mem); fd_bo_del(fd6_ctx->vsc_size_mem);
@ -52,8 +54,6 @@ fd6_context_destroy(struct pipe_context *pctx)
u_upload_destroy(fd6_ctx->border_color_uploader); u_upload_destroy(fd6_ctx->border_color_uploader);
fd_context_destroy(pctx);
free(fd6_ctx); free(fd6_ctx);
} }