diff options
author | Timothy Arceri <[email protected]> | 2017-03-05 12:32:01 +1100 |
---|---|---|
committer | Timothy Arceri <[email protected]> | 2017-03-07 08:48:11 +1100 |
commit | 2efddc63ee864ab917e444b68a7c2dcf520d451e (patch) | |
tree | c5b3e14ccdf933775310fe593f6c14baf2b88f7b /src/gallium/winsys/radeon | |
parent | 464d4806c112c6d224a55b328cde327a025acd91 (diff) |
gallium/util: replace pipe_mutex with mtx_t
pipe_mutex was made unnecessary with fd33a6bcd7f12.
Reviewed-by: Marek Olšák <[email protected]>
Diffstat (limited to 'src/gallium/winsys/radeon')
-rw-r--r-- | src/gallium/winsys/radeon/drm/radeon_drm_bo.h | 2 | ||||
-rw-r--r-- | src/gallium/winsys/radeon/drm/radeon_drm_winsys.c | 2 | ||||
-rw-r--r-- | src/gallium/winsys/radeon/drm/radeon_drm_winsys.h | 10 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_bo.h b/src/gallium/winsys/radeon/drm/radeon_drm_bo.h index 236e94cbbff..d5fababe702 100644 --- a/src/gallium/winsys/radeon/drm/radeon_drm_bo.h +++ b/src/gallium/winsys/radeon/drm/radeon_drm_bo.h @@ -43,7 +43,7 @@ struct radeon_bo { struct pb_cache_entry cache_entry; void *ptr; - pipe_mutex map_mutex; + mtx_t map_mutex; unsigned map_count; bool use_reusable_pool; } real; diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c b/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c index a39a7bed5f4..6c6d920d032 100644 --- a/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c +++ b/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c @@ -57,7 +57,7 @@ pipe_static_mutex(fd_tab_mutex); * with multiple contexts (here command streams) backed by one winsys. */ static bool radeon_set_fd_access(struct radeon_drm_cs *applier, struct radeon_drm_cs **owner, - pipe_mutex *mutex, + mtx_t *mutex, unsigned request, const char *request_name, bool enable) { diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_winsys.h b/src/gallium/winsys/radeon/drm/radeon_drm_winsys.h index 04659e45ef7..362dab22398 100644 --- a/src/gallium/winsys/radeon/drm/radeon_drm_winsys.h +++ b/src/gallium/winsys/radeon/drm/radeon_drm_winsys.h @@ -78,9 +78,9 @@ struct radeon_drm_winsys { struct util_hash_table *bo_handles; /* List of buffer virtual memory ranges. Protectded by bo_handles_mutex. */ struct util_hash_table *bo_vas; - pipe_mutex bo_handles_mutex; - pipe_mutex bo_va_mutex; - pipe_mutex bo_fence_lock; + mtx_t bo_handles_mutex; + mtx_t bo_va_mutex; + mtx_t bo_fence_lock; uint64_t va_offset; struct list_head va_holes; @@ -91,9 +91,9 @@ struct radeon_drm_winsys { uint32_t num_cpus; /* Number of CPUs. */ struct radeon_drm_cs *hyperz_owner; - pipe_mutex hyperz_owner_mutex; + mtx_t hyperz_owner_mutex; struct radeon_drm_cs *cmask_owner; - pipe_mutex cmask_owner_mutex; + mtx_t cmask_owner_mutex; /* multithreaded command submission */ struct util_queue cs_queue; |