etnaviv: Use hash table to track BO indexes

[mesa.git] / src / etnaviv / drm / etnaviv_bo_cache.c

diff --git a/src/etnaviv/drm/etnaviv_bo_cache.c b/src/etnaviv/drm/etnaviv_bo_cache.c
index fa0d2a28451e7a1e48ff8f4b6f02664fd8b98725..918d00d4e1d413646407ec2896673dbf2dd752a1 100644 (file)
--- 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"
 
-void bo_del(struct etna_bo *bo);
-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)
 {
@@ -66,7 +66,7 @@ void etna_bo_cache_init(struct etna_bo_cache *cache)
        }
 }
 
-/* Frees older cached buffers.  Called under table_lock */
+/* 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 @@ 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;
 }