Merge Mesa 21.1.5

1 files changed, 1 insertions, 3 deletions

diff --git a/lib/mesa/src/gallium/drivers/etnaviv/etnaviv_resource.h b/lib/mesa/src/gallium/drivers/etnaviv/etnaviv_resource.h
index 1da0315ab..cb83e891d 100644
--- a/lib/mesa/src/gallium/drivers/etnaviv/etnaviv_resource.h
+++ b/lib/mesa/src/gallium/drivers/etnaviv/etnaviv_resource.h
@@ -96,6 +96,7 @@ struct etna_resource {
 
    enum etna_resource_status status;
 
+   mtx_t lock; /* Lock to protect pending_ctx */
    struct set *pending_ctx;
 };
 
@@ -150,9 +151,6 @@ etna_resource(struct pipe_resource *p)
    return (struct etna_resource *)p;
 }
 
-enum etna_resource_status
-etna_resource_get_status(struct etna_context *ctx, struct etna_resource *rsc);
-
 void
 etna_resource_used(struct etna_context *ctx, struct pipe_resource *prsc,
                    enum etna_resource_status status);