diff options
author | Timothy Arceri <[email protected]> | 2017-03-05 12:32:04 +1100 |
---|---|---|
committer | Timothy Arceri <[email protected]> | 2017-03-07 08:52:16 +1100 |
commit | be188289e1bf0e259c91a751c405d54bb99bc5d4 (patch) | |
tree | 3c160d99455b38128cc79e113f5a9280e762878d /src/gallium/winsys | |
parent | 75b47dda0c8895afe77858cbb67efa38e17e1838 (diff) |
gallium/util: replace pipe_mutex_destroy() with mtx_destroy()
pipe_mutex_destroy() was made unnecessary with fd33a6bcd7f12.
Replace was done with:
find ./src -type f -exec sed -i -- \
's:pipe_mutex_destroy(\([^)]*\)):mtx_destroy(\&\1):g' {} \;
Reviewed-by: Marek Olšák <[email protected]>
Diffstat (limited to 'src/gallium/winsys')
-rw-r--r-- | src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c | 4 | ||||
-rw-r--r-- | src/gallium/winsys/radeon/drm/radeon_drm_bo.c | 2 | ||||
-rw-r--r-- | src/gallium/winsys/radeon/drm/radeon_drm_winsys.c | 10 | ||||
-rw-r--r-- | src/gallium/winsys/svga/drm/pb_buffer_simple_fenced.c | 2 | ||||
-rw-r--r-- | src/gallium/winsys/svga/drm/vmw_surface.c | 2 | ||||
-rw-r--r-- | src/gallium/winsys/virgl/drm/virgl_drm_winsys.c | 4 | ||||
-rw-r--r-- | src/gallium/winsys/virgl/vtest/virgl_vtest_winsys.c | 2 |
7 files changed, 13 insertions, 13 deletions
diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c b/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c index f19c935f085..ae4e403ba43 100644 --- a/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c +++ b/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c @@ -389,10 +389,10 @@ static void amdgpu_winsys_destroy(struct radeon_winsys *rws) if (util_queue_is_initialized(&ws->cs_queue)) util_queue_destroy(&ws->cs_queue); - pipe_mutex_destroy(ws->bo_fence_lock); + mtx_destroy(&ws->bo_fence_lock); pb_slabs_deinit(&ws->bo_slabs); pb_cache_deinit(&ws->bo_cache); - pipe_mutex_destroy(ws->global_bo_list_lock); + mtx_destroy(&ws->global_bo_list_lock); do_winsys_deinit(ws); FREE(rws); } diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_bo.c b/src/gallium/winsys/radeon/drm/radeon_drm_bo.c index e54dcaca679..786b1f61b10 100644 --- a/src/gallium/winsys/radeon/drm/radeon_drm_bo.c +++ b/src/gallium/winsys/radeon/drm/radeon_drm_bo.c @@ -370,7 +370,7 @@ void radeon_bo_destroy(struct pb_buffer *_buf) args.handle = bo->handle; drmIoctl(rws->fd, DRM_IOCTL_GEM_CLOSE, &args); - pipe_mutex_destroy(bo->u.real.map_mutex); + mtx_destroy(&bo->u.real.map_mutex); if (bo->initial_domain & RADEON_DOMAIN_VRAM) rws->allocated_vram -= align(bo->base.size, rws->info.gart_page_size); diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c b/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c index abab4aab8d8..bbcf7a225f2 100644 --- a/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c +++ b/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c @@ -538,8 +538,8 @@ static void radeon_winsys_destroy(struct radeon_winsys *rws) if (util_queue_is_initialized(&ws->cs_queue)) util_queue_destroy(&ws->cs_queue); - pipe_mutex_destroy(ws->hyperz_owner_mutex); - pipe_mutex_destroy(ws->cmask_owner_mutex); + mtx_destroy(&ws->hyperz_owner_mutex); + mtx_destroy(&ws->cmask_owner_mutex); if (ws->info.has_virtual_memory) pb_slabs_deinit(&ws->bo_slabs); @@ -552,9 +552,9 @@ static void radeon_winsys_destroy(struct radeon_winsys *rws) util_hash_table_destroy(ws->bo_names); util_hash_table_destroy(ws->bo_handles); util_hash_table_destroy(ws->bo_vas); - pipe_mutex_destroy(ws->bo_handles_mutex); - pipe_mutex_destroy(ws->bo_va_mutex); - pipe_mutex_destroy(ws->bo_fence_lock); + mtx_destroy(&ws->bo_handles_mutex); + mtx_destroy(&ws->bo_va_mutex); + mtx_destroy(&ws->bo_fence_lock); if (ws->fd >= 0) close(ws->fd); diff --git a/src/gallium/winsys/svga/drm/pb_buffer_simple_fenced.c b/src/gallium/winsys/svga/drm/pb_buffer_simple_fenced.c index 0553662380f..293fe7e032e 100644 --- a/src/gallium/winsys/svga/drm/pb_buffer_simple_fenced.c +++ b/src/gallium/winsys/svga/drm/pb_buffer_simple_fenced.c @@ -809,7 +809,7 @@ fenced_bufmgr_destroy(struct pb_manager *mgr) #endif pipe_mutex_unlock(fenced_mgr->mutex); - pipe_mutex_destroy(fenced_mgr->mutex); + mtx_destroy(&fenced_mgr->mutex); FREE(fenced_mgr); } diff --git a/src/gallium/winsys/svga/drm/vmw_surface.c b/src/gallium/winsys/svga/drm/vmw_surface.c index a438b1a7c5b..9fadbf95a02 100644 --- a/src/gallium/winsys/svga/drm/vmw_surface.c +++ b/src/gallium/winsys/svga/drm/vmw_surface.c @@ -201,7 +201,7 @@ vmw_svga_winsys_surface_reference(struct vmw_svga_winsys_surface **pdst, assert(p_atomic_read(&dst->validated) == 0); dst->sid = SVGA3D_INVALID_ID; #endif - pipe_mutex_destroy(dst->mutex); + mtx_destroy(&dst->mutex); FREE(dst); } diff --git a/src/gallium/winsys/virgl/drm/virgl_drm_winsys.c b/src/gallium/winsys/virgl/drm/virgl_drm_winsys.c index b6a42343a5e..4f3fa4d810c 100644 --- a/src/gallium/winsys/virgl/drm/virgl_drm_winsys.c +++ b/src/gallium/winsys/virgl/drm/virgl_drm_winsys.c @@ -120,8 +120,8 @@ virgl_drm_winsys_destroy(struct virgl_winsys *qws) util_hash_table_destroy(qdws->bo_handles); util_hash_table_destroy(qdws->bo_names); - pipe_mutex_destroy(qdws->bo_handles_mutex); - pipe_mutex_destroy(qdws->mutex); + mtx_destroy(&qdws->bo_handles_mutex); + mtx_destroy(&qdws->mutex); FREE(qdws); } diff --git a/src/gallium/winsys/virgl/vtest/virgl_vtest_winsys.c b/src/gallium/winsys/virgl/vtest/virgl_vtest_winsys.c index a8c874a4f69..dde53e70794 100644 --- a/src/gallium/winsys/virgl/vtest/virgl_vtest_winsys.c +++ b/src/gallium/winsys/virgl/vtest/virgl_vtest_winsys.c @@ -619,7 +619,7 @@ virgl_vtest_winsys_destroy(struct virgl_winsys *vws) virgl_cache_flush(vtws); - pipe_mutex_destroy(vtws->mutex); + mtx_destroy(&vtws->mutex); FREE(vtws); } |