etnaviv: Use hash table to track BO indexes

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

diff --git a/src/etnaviv/drm/etnaviv_device.c b/src/etnaviv/drm/etnaviv_device.c
index 699df256f40fe42602774a6e326fd57067306514..b8d465ac8a40f625fdd854f06274efc66a21ea6b 100644 (file)
--- a/src/etnaviv/drm/etnaviv_device.c
+++ b/src/etnaviv/drm/etnaviv_device.c
@@ -24,34 +24,36 @@
  *    Christian Gmeiner <christian.gmeiner@gmail.com>
  */
 
-#include <stdlib.h>
-#include <linux/stddef.h>
-#include <linux/types.h>
-#include <errno.h>
-#include <sys/mman.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <pthread.h>
-
-#include <xf86drm.h>
-#include <xf86atomic.h>
+#include "util/hash_table.h"
 
 #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;
 
-drm_public struct etna_device *etna_device_new(int fd)
+static uint32_t
+u32_hash(const void *key)
+{
+       return _mesa_hash_data(key, sizeof(uint32_t));
+}
+
+static bool
+u32_equals(const void *key1, const void *key2)
+{
+       return *(const uint32_t *)key1 == *(const uint32_t *)key2;
+}
+
+struct etna_device *etna_device_new(int fd)
 {
        struct etna_device *dev = calloc(sizeof(*dev), 1);
 
        if (!dev)
                return NULL;
 
-       atomic_set(&dev->refcnt, 1);
+       p_atomic_set(&dev->refcnt, 1);
        dev->fd = fd;
-       dev->handle_table = drmHashCreate();
-       dev->name_table = drmHashCreate();
+       dev->handle_table = _mesa_hash_table_create(NULL, u32_hash, u32_equals);
+       dev->name_table = _mesa_hash_table_create(NULL, u32_hash, u32_equals);
        etna_bo_cache_init(&dev->bo_cache);
 
        return dev;
@@ -59,7 +61,7 @@ drm_public struct etna_device *etna_device_new(int fd)
 
 /* like etna_device_new() but creates it's own private dup() of the fd
  * which is close()d when the device is finalized. */
-drm_public struct etna_device *etna_device_new_dup(int fd)
+struct etna_device *etna_device_new_dup(int fd)
 {
        int dup_fd = dup(fd);
        struct etna_device *dev = etna_device_new(dup_fd);
@@ -72,9 +74,9 @@ drm_public struct etna_device *etna_device_new_dup(int fd)
        return dev;
 }
 
-drm_public struct etna_device *etna_device_ref(struct etna_device *dev)
+struct etna_device *etna_device_ref(struct etna_device *dev)
 {
-       atomic_inc(&dev->refcnt);
+       p_atomic_inc(&dev->refcnt);
 
        return dev;
 }
@@ -82,8 +84,8 @@ drm_public struct etna_device *etna_device_ref(struct etna_device *dev)
 static void etna_device_del_impl(struct etna_device *dev)
 {
        etna_bo_cache_cleanup(&dev->bo_cache, 0);
-       drmHashDestroy(dev->handle_table);
-       drmHashDestroy(dev->name_table);
+       _mesa_hash_table_destroy(dev->handle_table, NULL);
+       _mesa_hash_table_destroy(dev->name_table, NULL);
 
        if (dev->closefd)
                close(dev->fd);
@@ -91,25 +93,25 @@ static void etna_device_del_impl(struct etna_device *dev)
        free(dev);
 }
 
-drm_private void etna_device_del_locked(struct etna_device *dev)
+void etna_device_del_locked(struct etna_device *dev)
 {
-       if (!atomic_dec_and_test(&dev->refcnt))
+       if (!p_atomic_dec_zero(&dev->refcnt))
                return;
 
        etna_device_del_impl(dev);
 }
 
-drm_public void etna_device_del(struct etna_device *dev)
+void etna_device_del(struct etna_device *dev)
 {
-       if (!atomic_dec_and_test(&dev->refcnt))
+       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);
 }
 
-drm_public int etna_device_fd(struct etna_device *dev)
+int etna_device_fd(struct etna_device *dev)
 {
    return dev->fd;
 }