From 2e4f874fa5bcb68d4520cba8e87e8f420085ff11 Mon Sep 17 00:00:00 2001 From: Yonggang Luo Date: Mon, 13 Feb 2023 16:43:39 +0800 Subject: [PATCH] =?UTF-8?q?freedreno:=20Fixes=20error:=20passing=20argumen?= =?UTF-8?q?t=201=20of=20=E2=80=98pthread=5Fmutex=5Funlock=E2=80=99=20from?= =?UTF-8?q?=20incompatible=20pointer=20type=20in=20tu=5Fpipeline.c?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit src/freedreno/vulkan/tu_pipeline.c:4723:25: error: passing argument 1 of ‘pthread_mutex_unlock’ from incompatible pointer type [-Werror=incompatible-pointer-types] 4723 | pthread_mutex_unlock(&dev->pipeline_mutex); | ^~~~~~~~~~~~~~~~~~~~ | | | mtx_t * In file included from ../../src/freedreno/vulkan/tu_common.h:14, from ../../src/freedreno/vulkan/tu_pipeline.h:13, from ../../src/freedreno/vulkan/tu_pipeline.c:10: /usr/include/pthread.h:835:51: note: expected ‘pthread_mutex_t *’ but argument is of type ‘mtx_t *’ 835 | extern int pthread_mutex_unlock (pthread_mutex_t *__mutex) Signed-off-by: Yonggang Luo Reviewed-by: Jesse Natalie Acked-by: David Heidelberg Acked-by: Rob Clark Part-of: --- src/freedreno/vulkan/tu_pipeline.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/freedreno/vulkan/tu_pipeline.cc b/src/freedreno/vulkan/tu_pipeline.cc index 93d295f8e86..3e15f669698 100644 --- a/src/freedreno/vulkan/tu_pipeline.cc +++ b/src/freedreno/vulkan/tu_pipeline.cc @@ -2557,10 +2557,10 @@ tu_pipeline_allocate_cs(struct tu_device *dev, * can't use its EXTERNALLY_SYNCHRONIZED flag to avoid atomics because * pipeline destroy isn't synchronized by the cache. */ - pthread_mutex_lock(&dev->pipeline_mutex); + mtx_lock(&dev->pipeline_mutex); VkResult result = tu_suballoc_bo_alloc(&pipeline->bo, &dev->pipeline_suballoc, size * 4, 128); - pthread_mutex_unlock(&dev->pipeline_mutex); + mtx_unlock(&dev->pipeline_mutex); if (result != VK_SUCCESS) return result; @@ -4832,9 +4832,9 @@ tu_pipeline_finish(struct tu_pipeline *pipeline, const VkAllocationCallbacks *alloc) { tu_cs_finish(&pipeline->cs); - pthread_mutex_lock(&dev->pipeline_mutex); + mtx_lock(&dev->pipeline_mutex); tu_suballoc_bo_free(&dev->pipeline_suballoc, &pipeline->bo); - pthread_mutex_unlock(&dev->pipeline_mutex); + mtx_unlock(&dev->pipeline_mutex); if (pipeline->pvtmem_bo) tu_bo_finish(dev, pipeline->pvtmem_bo);