diff options
author | Timothy Arceri <[email protected]> | 2017-03-05 12:32:06 +1100 |
---|---|---|
committer | Timothy Arceri <[email protected]> | 2017-03-07 08:53:05 +1100 |
commit | 628e84a58fdb26c63a705861b92f65f242613321 (patch) | |
tree | bd6084a4dee53a1f180c62f41e790ab490ddf3ee /src/gallium/winsys/svga/drm | |
parent | ba72554f3e576c1674d52ab16d8d2edff9398b71 (diff) |
gallium/util: replace pipe_mutex_unlock() with mtx_unlock()
pipe_mutex_unlock() was made unnecessary with fd33a6bcd7f12.
Replaced using:
find ./src -type f -exec sed -i -- \
's:pipe_mutex_unlock(\([^)]*\)):mtx_unlock(\&\1):g' {} \;
Reviewed-by: Marek Olšák <[email protected]>
Diffstat (limited to 'src/gallium/winsys/svga/drm')
-rw-r--r-- | src/gallium/winsys/svga/drm/pb_buffer_simple_fenced.c | 24 | ||||
-rw-r--r-- | src/gallium/winsys/svga/drm/vmw_context.c | 2 | ||||
-rw-r--r-- | src/gallium/winsys/svga/drm/vmw_fence.c | 8 | ||||
-rw-r--r-- | src/gallium/winsys/svga/drm/vmw_surface.c | 4 |
4 files changed, 19 insertions, 19 deletions
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 85d2afc6f9c..f7211c29ac6 100644 --- a/src/gallium/winsys/svga/drm/pb_buffer_simple_fenced.c +++ b/src/gallium/winsys/svga/drm/pb_buffer_simple_fenced.c @@ -311,7 +311,7 @@ fenced_buffer_finish_locked(struct fenced_manager *fenced_mgr, ops->fence_reference(ops, &fence, fenced_buf->fence); - pipe_mutex_unlock(fenced_mgr->mutex); + mtx_unlock(&fenced_mgr->mutex); finished = ops->fence_finish(ops, fenced_buf->fence, 0); @@ -512,7 +512,7 @@ fenced_buffer_destroy(struct pb_buffer *buf) fenced_buffer_destroy_locked(fenced_mgr, fenced_buf); - pipe_mutex_unlock(fenced_mgr->mutex); + mtx_unlock(&fenced_mgr->mutex); } @@ -564,7 +564,7 @@ fenced_buffer_map(struct pb_buffer *buf, } done: - pipe_mutex_unlock(fenced_mgr->mutex); + mtx_unlock(&fenced_mgr->mutex); return map; } @@ -587,7 +587,7 @@ fenced_buffer_unmap(struct pb_buffer *buf) fenced_buf->flags &= ~PB_USAGE_CPU_READ_WRITE; } - pipe_mutex_unlock(fenced_mgr->mutex); + mtx_unlock(&fenced_mgr->mutex); } @@ -635,7 +635,7 @@ fenced_buffer_validate(struct pb_buffer *buf, fenced_buf->validation_flags |= flags; done: - pipe_mutex_unlock(fenced_mgr->mutex); + mtx_unlock(&fenced_mgr->mutex); return ret; } @@ -676,7 +676,7 @@ fenced_buffer_fence(struct pb_buffer *buf, fenced_buf->validation_flags = 0; } - pipe_mutex_unlock(fenced_mgr->mutex); + mtx_unlock(&fenced_mgr->mutex); } @@ -699,7 +699,7 @@ fenced_buffer_get_base_buffer(struct pb_buffer *buf, *offset = 0; } - pipe_mutex_unlock(fenced_mgr->mutex); + mtx_unlock(&fenced_mgr->mutex); } @@ -758,12 +758,12 @@ fenced_bufmgr_create_buffer(struct pb_manager *mgr, LIST_ADDTAIL(&fenced_buf->head, &fenced_mgr->unfenced); ++fenced_mgr->num_unfenced; - pipe_mutex_unlock(fenced_mgr->mutex); + mtx_unlock(&fenced_mgr->mutex); return &fenced_buf->base; no_storage: - pipe_mutex_unlock(fenced_mgr->mutex); + mtx_unlock(&fenced_mgr->mutex); FREE(fenced_buf); no_buffer: return NULL; @@ -778,7 +778,7 @@ fenced_bufmgr_flush(struct pb_manager *mgr) mtx_lock(&fenced_mgr->mutex); while(fenced_manager_check_signalled_locked(fenced_mgr, TRUE)) ; - pipe_mutex_unlock(fenced_mgr->mutex); + mtx_unlock(&fenced_mgr->mutex); assert(fenced_mgr->provider->flush); if(fenced_mgr->provider->flush) @@ -795,7 +795,7 @@ fenced_bufmgr_destroy(struct pb_manager *mgr) /* Wait on outstanding fences */ while (fenced_mgr->num_fenced) { - pipe_mutex_unlock(fenced_mgr->mutex); + mtx_unlock(&fenced_mgr->mutex); #if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS) sched_yield(); #endif @@ -808,7 +808,7 @@ fenced_bufmgr_destroy(struct pb_manager *mgr) /*assert(!fenced_mgr->num_unfenced);*/ #endif - pipe_mutex_unlock(fenced_mgr->mutex); + mtx_unlock(&fenced_mgr->mutex); mtx_destroy(&fenced_mgr->mutex); FREE(fenced_mgr); diff --git a/src/gallium/winsys/svga/drm/vmw_context.c b/src/gallium/winsys/svga/drm/vmw_context.c index a5dd66f36d9..002994e9dc9 100644 --- a/src/gallium/winsys/svga/drm/vmw_context.c +++ b/src/gallium/winsys/svga/drm/vmw_context.c @@ -533,7 +533,7 @@ vmw_swc_surface_relocation(struct svga_winsys_context *swc, vmw_swc_mob_relocation(swc, mobid, NULL, (struct svga_winsys_buffer *) vsurf->buf, 0, flags); - pipe_mutex_unlock(vsurf->mutex); + mtx_unlock(&vsurf->mutex); } } diff --git a/src/gallium/winsys/svga/drm/vmw_fence.c b/src/gallium/winsys/svga/drm/vmw_fence.c index 23713fc5275..edf205e6239 100644 --- a/src/gallium/winsys/svga/drm/vmw_fence.c +++ b/src/gallium/winsys/svga/drm/vmw_fence.c @@ -104,7 +104,7 @@ vmw_fences_release(struct vmw_fence_ops *ops) mtx_lock(&ops->mutex); LIST_FOR_EACH_ENTRY_SAFE(fence, n, &ops->not_signaled, ops_list) LIST_DELINIT(&fence->ops_list); - pipe_mutex_unlock(ops->mutex); + mtx_unlock(&ops->mutex); } /** @@ -152,7 +152,7 @@ vmw_fences_signal(struct pb_fence_ops *fence_ops, ops->last_emitted = emitted; out_unlock: - pipe_mutex_unlock(ops->mutex); + mtx_unlock(&ops->mutex); } @@ -203,7 +203,7 @@ vmw_fence_create(struct pb_fence_ops *fence_ops, uint32_t handle, LIST_ADDTAIL(&fence->ops_list, &ops->not_signaled); } - pipe_mutex_unlock(ops->mutex); + mtx_unlock(&ops->mutex); return (struct pipe_fence_handle *) fence; } @@ -231,7 +231,7 @@ vmw_fence_reference(struct vmw_winsys_screen *vws, mtx_lock(&ops->mutex); LIST_DELINIT(&vfence->ops_list); - pipe_mutex_unlock(ops->mutex); + mtx_unlock(&ops->mutex); FREE(vfence); } diff --git a/src/gallium/winsys/svga/drm/vmw_surface.c b/src/gallium/winsys/svga/drm/vmw_surface.c index 460949dcbb6..69408ffe9d9 100644 --- a/src/gallium/winsys/svga/drm/vmw_surface.c +++ b/src/gallium/winsys/svga/drm/vmw_surface.c @@ -154,7 +154,7 @@ out_mapped: vsrf->data = data; vsrf->map_mode = flags & (PIPE_TRANSFER_READ | PIPE_TRANSFER_WRITE); out_unlock: - pipe_mutex_unlock(vsrf->mutex); + mtx_unlock(&vsrf->mutex); return data; } @@ -173,7 +173,7 @@ vmw_svga_winsys_surface_unmap(struct svga_winsys_context *swc, } else { *rebind = FALSE; } - pipe_mutex_unlock(vsrf->mutex); + mtx_unlock(&vsrf->mutex); } void |