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/virgl | |
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/virgl')
-rw-r--r-- | src/gallium/winsys/virgl/drm/virgl_drm_winsys.c | 22 | ||||
-rw-r--r-- | src/gallium/winsys/virgl/vtest/virgl_vtest_winsys.c | 8 |
2 files changed, 15 insertions, 15 deletions
diff --git a/src/gallium/winsys/virgl/drm/virgl_drm_winsys.c b/src/gallium/winsys/virgl/drm/virgl_drm_winsys.c index 3986305706e..36c75128f46 100644 --- a/src/gallium/winsys/virgl/drm/virgl_drm_winsys.c +++ b/src/gallium/winsys/virgl/drm/virgl_drm_winsys.c @@ -57,14 +57,14 @@ static void virgl_hw_res_destroy(struct virgl_drm_winsys *qdws, mtx_lock(&qdws->bo_handles_mutex); util_hash_table_remove(qdws->bo_names, (void *)(uintptr_t)res->flink); - pipe_mutex_unlock(qdws->bo_handles_mutex); + mtx_unlock(&qdws->bo_handles_mutex); } if (res->bo_handle) { mtx_lock(&qdws->bo_handles_mutex); util_hash_table_remove(qdws->bo_handles, (void *)(uintptr_t)res->bo_handle); - pipe_mutex_unlock(qdws->bo_handles_mutex); + mtx_unlock(&qdws->bo_handles_mutex); } if (res->ptr) @@ -109,7 +109,7 @@ virgl_cache_flush(struct virgl_drm_winsys *qdws) curr = next; next = curr->next; } - pipe_mutex_unlock(qdws->mutex); + mtx_unlock(&qdws->mutex); } static void virgl_drm_winsys_destroy(struct virgl_winsys *qws) @@ -165,7 +165,7 @@ static void virgl_drm_resource_reference(struct virgl_drm_winsys *qdws, old->end = old->start + qdws->usecs; LIST_ADDTAIL(&old->head, &qdws->delayed); qdws->num_delayed++; - pipe_mutex_unlock(qdws->mutex); + mtx_unlock(&qdws->mutex); } } *dres = sres; @@ -353,12 +353,12 @@ virgl_drm_winsys_resource_cache_create(struct virgl_winsys *qws, if (res) { LIST_DEL(&res->head); --qdws->num_delayed; - pipe_mutex_unlock(qdws->mutex); + mtx_unlock(&qdws->mutex); pipe_reference_init(&res->reference, 1); return res; } - pipe_mutex_unlock(qdws->mutex); + mtx_unlock(&qdws->mutex); alloc: res = virgl_drm_winsys_resource_create(qws, target, format, bind, @@ -453,7 +453,7 @@ virgl_drm_winsys_resource_create_handle(struct virgl_winsys *qws, util_hash_table_set(qdws->bo_handles, (void *)(uintptr_t)handle, res); done: - pipe_mutex_unlock(qdws->bo_handles_mutex); + mtx_unlock(&qdws->bo_handles_mutex); return res; } @@ -481,7 +481,7 @@ static boolean virgl_drm_winsys_resource_get_handle(struct virgl_winsys *qws, mtx_lock(&qdws->bo_handles_mutex); util_hash_table_set(qdws->bo_names, (void *)(uintptr_t)res->flink, res); - pipe_mutex_unlock(qdws->bo_handles_mutex); + mtx_unlock(&qdws->bo_handles_mutex); } whandle->handle = res->flink; } else if (whandle->type == DRM_API_HANDLE_TYPE_KMS) { @@ -491,7 +491,7 @@ static boolean virgl_drm_winsys_resource_get_handle(struct virgl_winsys *qws, return FALSE; mtx_lock(&qdws->bo_handles_mutex); util_hash_table_set(qdws->bo_handles, (void *)(uintptr_t)res->bo_handle, res); - pipe_mutex_unlock(qdws->bo_handles_mutex); + mtx_unlock(&qdws->bo_handles_mutex); } whandle->stride = stride; return TRUE; @@ -820,7 +820,7 @@ virgl_drm_screen_destroy(struct pipe_screen *pscreen) int fd = virgl_drm_winsys(screen->vws)->fd; util_hash_table_remove(fd_tab, intptr_to_pointer(fd)); } - pipe_mutex_unlock(virgl_screen_mutex); + mtx_unlock(&virgl_screen_mutex); if (destroy) { pscreen->destroy = screen->winsys_priv; @@ -885,6 +885,6 @@ virgl_drm_screen_create(int fd) } unlock: - pipe_mutex_unlock(virgl_screen_mutex); + mtx_unlock(&virgl_screen_mutex); return pscreen; } diff --git a/src/gallium/winsys/virgl/vtest/virgl_vtest_winsys.c b/src/gallium/winsys/virgl/vtest/virgl_vtest_winsys.c index 70bd6aff9bf..404ba58b08d 100644 --- a/src/gallium/winsys/virgl/vtest/virgl_vtest_winsys.c +++ b/src/gallium/winsys/virgl/vtest/virgl_vtest_winsys.c @@ -155,7 +155,7 @@ virgl_cache_flush(struct virgl_vtest_winsys *vtws) curr = next; next = curr->next; } - pipe_mutex_unlock(vtws->mutex); + mtx_unlock(&vtws->mutex); } static void @@ -196,7 +196,7 @@ static void virgl_vtest_resource_reference(struct virgl_vtest_winsys *vtws, old->end = old->start + vtws->usecs; LIST_ADDTAIL(&old->head, &vtws->delayed); vtws->num_delayed++; - pipe_mutex_unlock(vtws->mutex); + mtx_unlock(&vtws->mutex); } } *dres = sres; @@ -376,12 +376,12 @@ virgl_vtest_winsys_resource_cache_create(struct virgl_winsys *vws, if (res) { LIST_DEL(&res->head); --vtws->num_delayed; - pipe_mutex_unlock(vtws->mutex); + mtx_unlock(&vtws->mutex); pipe_reference_init(&res->reference, 1); return res; } - pipe_mutex_unlock(vtws->mutex); + mtx_unlock(&vtws->mutex); alloc: res = virgl_vtest_winsys_resource_create(vws, target, format, bind, |