diff options
| author | Timothy Arceri <[email protected]> | 2017-03-05 12:12:30 +1100 |
|---|---|---|
| committer | Timothy Arceri <[email protected]> | 2017-03-07 08:52:38 +1100 |
| commit | ba72554f3e576c1674d52ab16d8d2edff9398b71 (patch) | |
| tree | 317c80f33ea1edcf238d3545ff1a6104a7d55fc8 /src/gallium/drivers/vc4 | |
| parent | be188289e1bf0e259c91a751c405d54bb99bc5d4 (diff) | |
gallium/util: replace pipe_mutex_lock() with mtx_lock()
replace pipe_mutex_lock() was made unnecessary with fd33a6bcd7f12.
Replaced using:
find ./src -type f -exec sed -i -- \
's:pipe_mutex_lock(\([^)]*\)):mtx_lock(\&\1):g' {} \;
Reviewed-by: Marek Olšák <[email protected]>
Diffstat (limited to 'src/gallium/drivers/vc4')
| -rw-r--r-- | src/gallium/drivers/vc4/vc4_bufmgr.c | 10 | ||||
| -rw-r--r-- | src/gallium/drivers/vc4/vc4_bufmgr.h | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/gallium/drivers/vc4/vc4_bufmgr.c b/src/gallium/drivers/vc4/vc4_bufmgr.c index c0ff531e6ab..c46e56416fe 100644 --- a/src/gallium/drivers/vc4/vc4_bufmgr.c +++ b/src/gallium/drivers/vc4/vc4_bufmgr.c @@ -97,7 +97,7 @@ vc4_bo_from_cache(struct vc4_screen *screen, uint32_t size, const char *name) return NULL; struct vc4_bo *bo = NULL; - pipe_mutex_lock(cache->lock); + mtx_lock(&cache->lock); if (!list_empty(&cache->size_list[page_index])) { bo = LIST_ENTRY(struct vc4_bo, cache->size_list[page_index].next, size_list); @@ -188,7 +188,7 @@ vc4_bo_last_unreference(struct vc4_bo *bo) struct timespec time; clock_gettime(CLOCK_MONOTONIC, &time); - pipe_mutex_lock(screen->bo_cache.lock); + mtx_lock(&screen->bo_cache.lock); vc4_bo_last_unreference_locked_timed(bo, time.tv_sec); pipe_mutex_unlock(screen->bo_cache.lock); } @@ -261,7 +261,7 @@ free_stale_bos(struct vc4_screen *screen, time_t time) static void vc4_bo_cache_free_all(struct vc4_bo_cache *cache) { - pipe_mutex_lock(cache->lock); + mtx_lock(&cache->lock); list_for_each_entry_safe(struct vc4_bo, bo, &cache->time_list, time_list) { vc4_bo_remove_from_cache(cache, bo); @@ -322,7 +322,7 @@ vc4_bo_open_handle(struct vc4_screen *screen, assert(size); - pipe_mutex_lock(screen->bo_handles_mutex); + mtx_lock(&screen->bo_handles_mutex); bo = util_hash_table_get(screen->bo_handles, (void*)(uintptr_t)handle); if (bo) { @@ -401,7 +401,7 @@ vc4_bo_get_dmabuf(struct vc4_bo *bo) return -1; } - pipe_mutex_lock(bo->screen->bo_handles_mutex); + mtx_lock(&bo->screen->bo_handles_mutex); bo->private = false; util_hash_table_set(bo->screen->bo_handles, (void *)(uintptr_t)bo->handle, bo); pipe_mutex_unlock(bo->screen->bo_handles_mutex); diff --git a/src/gallium/drivers/vc4/vc4_bufmgr.h b/src/gallium/drivers/vc4/vc4_bufmgr.h index bcabfd2b971..e996d0cadac 100644 --- a/src/gallium/drivers/vc4/vc4_bufmgr.h +++ b/src/gallium/drivers/vc4/vc4_bufmgr.h @@ -93,7 +93,7 @@ vc4_bo_unreference(struct vc4_bo **bo) vc4_bo_last_unreference(*bo); } else { screen = (*bo)->screen; - pipe_mutex_lock(screen->bo_handles_mutex); + mtx_lock(&screen->bo_handles_mutex); if (pipe_reference(&(*bo)->reference, NULL)) { util_hash_table_remove(screen->bo_handles, |