diff options
author | Guido Günther <[email protected]> | 2019-05-31 14:35:08 +0200 |
---|---|---|
committer | Guido Günther <[email protected]> | 2019-06-05 08:58:05 +0000 |
commit | 17d7282ccadba91a0a781a7e6cd0182c242e4151 (patch) | |
tree | 533d1783bf9b8714fe64c94386dfc8e9a37bab0a /src/etnaviv/drm/etnaviv_device.c | |
parent | 7a5b19346a48a4bea5a305684626e77972afbb71 (diff) |
etnaviv: drm: s/table_lock/etna_table_lock/
This avoids a conflict with freedreno's table_lock
Signed-off-by: Guido Günther <[email protected]>
Reviewed-by: Christian Gmeiner <[email protected]>
Diffstat (limited to 'src/etnaviv/drm/etnaviv_device.c')
-rw-r--r-- | src/etnaviv/drm/etnaviv_device.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/etnaviv/drm/etnaviv_device.c b/src/etnaviv/drm/etnaviv_device.c index 7dffb1cb3ab..b8d465ac8a4 100644 --- a/src/etnaviv/drm/etnaviv_device.c +++ b/src/etnaviv/drm/etnaviv_device.c @@ -29,7 +29,7 @@ #include "etnaviv_priv.h" #include "etnaviv_drmif.h" -static pthread_mutex_t table_lock = PTHREAD_MUTEX_INITIALIZER; +static pthread_mutex_t etna_drm_table_lock = PTHREAD_MUTEX_INITIALIZER; static uint32_t u32_hash(const void *key) @@ -106,9 +106,9 @@ void etna_device_del(struct etna_device *dev) if (!p_atomic_dec_zero(&dev->refcnt)) return; - pthread_mutex_lock(&table_lock); + pthread_mutex_lock(&etna_drm_table_lock); etna_device_del_impl(dev); - pthread_mutex_unlock(&table_lock); + pthread_mutex_unlock(&etna_drm_table_lock); } int etna_device_fd(struct etna_device *dev) |