X-Git-Url: https://git.libre-soc.org/?p=mesa.git;a=blobdiff_plain;f=src%2Fetnaviv%2Fdrm%2Fetnaviv_bo_cache.c;h=918d00d4e1d413646407ec2896673dbf2dd752a1;hp=c81de262f8ae147b10592b18c136e994276df05d;hb=95d8b4ac0bbef31aa99e21ee6ce18eb09c05d934;hpb=58eec3808eea94b78a3cdb65ad57ff3a94b51556

diff --git a/src/etnaviv/drm/etnaviv_bo_cache.c b/src/etnaviv/drm/etnaviv_bo_cache.c
index c81de262f8a..918d00d4e1d 100644
--- a/src/etnaviv/drm/etnaviv_bo_cache.c
+++ b/src/etnaviv/drm/etnaviv_bo_cache.c
@@ -27,8 +27,8 @@
 #include "etnaviv_priv.h"
 #include "etnaviv_drmif.h"
 
-drm_private void bo_del(struct etna_bo *bo);
-drm_private extern pthread_mutex_t table_lock;
+void _etna_bo_del(struct etna_bo *bo);
+extern pthread_mutex_t etna_drm_table_lock;
 
 static void add_bucket(struct etna_bo_cache *cache, int size)
 {
@@ -41,7 +41,7 @@ static void add_bucket(struct etna_bo_cache *cache, int size)
 	cache->num_buckets++;
 }
 
-drm_private void etna_bo_cache_init(struct etna_bo_cache *cache)
+void etna_bo_cache_init(struct etna_bo_cache *cache)
 {
 	unsigned long size, cache_max_size = 64 * 1024 * 1024;
 
@@ -66,8 +66,8 @@ drm_private void etna_bo_cache_init(struct etna_bo_cache *cache)
 	}
 }
 
-/* Frees older cached buffers.  Called under table_lock */
-drm_private void etna_bo_cache_cleanup(struct etna_bo_cache *cache, time_t time)
+/* Frees older cached buffers.  Called under etna_drm_table_lock */
+void etna_bo_cache_cleanup(struct etna_bo_cache *cache, time_t time)
 {
 	unsigned i;
 
@@ -86,7 +86,7 @@ drm_private void etna_bo_cache_cleanup(struct etna_bo_cache *cache, time_t time)
 				break;
 
 			list_del(&bo->list);
-			bo_del(bo);
+			_etna_bo_del(bo);
 		}
 	}
 
@@ -122,7 +122,7 @@ static struct etna_bo *find_in_bucket(struct etna_bo_bucket *bucket, uint32_t fl
 {
 	struct etna_bo *bo = NULL, *tmp;
 
-	pthread_mutex_lock(&table_lock);
+	pthread_mutex_lock(&etna_drm_table_lock);
 
 	if (LIST_IS_EMPTY(&bucket->list))
 		goto out_unlock;
@@ -146,7 +146,7 @@ static struct etna_bo *find_in_bucket(struct etna_bo_bucket *bucket, uint32_t fl
 	bo = NULL;
 
 out_unlock:
-	pthread_mutex_unlock(&table_lock);
+	pthread_mutex_unlock(&etna_drm_table_lock);
 
 	return bo;
 }
@@ -155,7 +155,7 @@ out_unlock:
  *
  * NOTE: size is potentially rounded up to bucket size
  */
-drm_private struct etna_bo *etna_bo_cache_alloc(struct etna_bo_cache *cache, uint32_t *size,
+struct etna_bo *etna_bo_cache_alloc(struct etna_bo_cache *cache, uint32_t *size,
     uint32_t flags)
 {
 	struct etna_bo *bo;
@@ -169,7 +169,7 @@ drm_private struct etna_bo *etna_bo_cache_alloc(struct etna_bo_cache *cache, uin
 		*size = bucket->size;
 		bo = find_in_bucket(bucket, flags);
 		if (bo) {
-			atomic_set(&bo->refcnt, 1);
+			p_atomic_set(&bo->refcnt, 1);
 			etna_device_ref(bo->dev);
 			return bo;
 		}
@@ -178,7 +178,7 @@ drm_private struct etna_bo *etna_bo_cache_alloc(struct etna_bo_cache *cache, uin
 	return NULL;
 }
 
-drm_private int etna_bo_cache_free(struct etna_bo_cache *cache, struct etna_bo *bo)
+int etna_bo_cache_free(struct etna_bo_cache *cache, struct etna_bo *bo)
 {
 	struct etna_bo_bucket *bucket = get_bucket(cache, bo->size);