freedreno: fix context teardown race

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>

diff --git a/src/gallium/drivers/freedreno/a3xx/fd3_context.c b/src/gallium/drivers/freedreno/a3xx/fd3_context.c
index bb9dd2893e707c21dbc04fd9746da1989a57f421..c045133a27f6836094a73cee9b0df1fae8ecbadc 100644 (file)
--- a/src/gallium/drivers/freedreno/a3xx/fd3_context.c
+++ b/src/gallium/drivers/freedreno/a3xx/fd3_context.c
@@ -44,6 +44,8 @@ fd3_context_destroy(struct pipe_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->fs_pvt_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_context_destroy(pctx);
-
        free(fd3_ctx);
 }
 

diff --git a/src/gallium/drivers/freedreno/a4xx/fd4_context.c b/src/gallium/drivers/freedreno/a4xx/fd4_context.c
index 12505e83a6c92cfa9b431ec9c5cc3987e11ce8df..97aae13bc640a83588fa77c9b8adc866082450c1 100644 (file)
--- a/src/gallium/drivers/freedreno/a4xx/fd4_context.c
+++ b/src/gallium/drivers/freedreno/a4xx/fd4_context.c
@@ -44,6 +44,8 @@ fd4_context_destroy(struct pipe_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->fs_pvt_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_context_destroy(pctx);
-
        free(fd4_ctx);
 }
 

diff --git a/src/gallium/drivers/freedreno/a5xx/fd5_context.c b/src/gallium/drivers/freedreno/a5xx/fd5_context.c
index 96e89bc8542a5ef7aee62176eaa7e9f9477b06be..d69b787064a56836567542284743e8f4edf64bd8 100644 (file)
--- a/src/gallium/drivers/freedreno/a5xx/fd5_context.c
+++ b/src/gallium/drivers/freedreno/a5xx/fd5_context.c
@@ -44,6 +44,8 @@ fd5_context_destroy(struct pipe_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->fs_pvt_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);
 
-       fd_context_destroy(pctx);
-
        free(fd5_ctx);
 }
 

diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_context.c b/src/gallium/drivers/freedreno/a6xx/fd6_context.c
index 4c415480875555e67de96056a2e496bef546b2c5..f67a0a761408ee7db6bd949244663c4da09913b3 100644 (file)
--- a/src/gallium/drivers/freedreno/a6xx/fd6_context.c
+++ b/src/gallium/drivers/freedreno/a6xx/fd6_context.c
@@ -43,6 +43,8 @@ fd6_context_destroy(struct pipe_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->fs_pvt_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);
 
-       fd_context_destroy(pctx);
-
        free(fd6_ctx);
 }