etnaviv: drm: Use _mesa_hash_table instead of drmHash

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

diff --git a/src/etnaviv/drm/etnaviv_bo.c b/src/etnaviv/drm/etnaviv_bo.c
index be88241d61b70fae33aeba7832a37a61c3de2a7e..096415afae3e0fdafe67d2564296066e5389454d 100644 (file)
--- a/src/etnaviv/drm/etnaviv_bo.c
+++ b/src/etnaviv/drm/etnaviv_bo.c
@@ -24,6 +24,9 @@
  *    Christian Gmeiner <christian.gmeiner@gmail.com>
  */
 
+#include "os/os_mman.h"
+#include "util/hash_table.h"
+
 #include "etnaviv_priv.h"
 #include "etnaviv_drmif.h"
 
@@ -35,24 +38,24 @@ static void set_name(struct etna_bo *bo, uint32_t name)
 {
        bo->name = name;
        /* add ourself into the name table: */
-       drmHashInsert(bo->dev->name_table, name, bo);
+       _mesa_hash_table_insert(bo->dev->name_table, &bo->name, bo);
 }
 
 /* Called under table_lock */
 void bo_del(struct etna_bo *bo)
 {
        if (bo->map)
-               drm_munmap(bo->map, bo->size);
+               os_munmap(bo->map, bo->size);
 
        if (bo->name)
-               drmHashDelete(bo->dev->name_table, bo->name);
+               _mesa_hash_table_remove_key(bo->dev->name_table, &bo->name);
 
        if (bo->handle) {
                struct drm_gem_close req = {
                        .handle = bo->handle,
                };
 
-               drmHashDelete(bo->dev->handle_table, bo->handle);
+               _mesa_hash_table_remove_key(bo->dev->handle_table, &bo->handle);
                drmIoctl(bo->dev->fd, DRM_IOCTL_GEM_CLOSE, &req);
        }
 
@@ -63,10 +66,11 @@ void bo_del(struct etna_bo *bo)
 static struct etna_bo *lookup_bo(void *tbl, uint32_t handle)
 {
        struct etna_bo *bo = NULL;
+       struct hash_entry *entry = _mesa_hash_table_search(tbl, &handle);
 
-       if (!drmHashLookup(tbl, handle, (void **)&bo)) {
+       if (entry) {
                /* found, incr refcnt and return: */
-               bo = etna_bo_ref(bo);
+               bo = etna_bo_ref(entry->data);
 
                /* don't break the bucket if this bo was found in one */
                list_delinit(&bo->list);
@@ -95,10 +99,10 @@ static struct etna_bo *bo_from_handle(struct etna_device *dev,
        bo->size = size;
        bo->handle = handle;
        bo->flags = flags;
-       atomic_set(&bo->refcnt, 1);
+       p_atomic_set(&bo->refcnt, 1);
        list_inithead(&bo->list);
        /* add ourselves to the handle table: */
-       drmHashInsert(dev->handle_table, handle, bo);
+       _mesa_hash_table_insert(dev->handle_table, &bo->handle, bo);
 
        return bo;
 }
@@ -133,7 +137,7 @@ struct etna_bo *etna_bo_new(struct etna_device *dev, uint32_t size,
 
 struct etna_bo *etna_bo_ref(struct etna_bo *bo)
 {
-       atomic_inc(&bo->refcnt);
+       p_atomic_inc(&bo->refcnt);
 
        return bo;
 }
@@ -239,7 +243,7 @@ void etna_bo_del(struct etna_bo *bo)
        if (!bo)
                return;
 
-       if (!atomic_dec_and_test(&bo->refcnt))
+       if (!p_atomic_dec_zero(&bo->refcnt))
                return;
 
        pthread_mutex_lock(&table_lock);
@@ -314,8 +318,8 @@ void *etna_bo_map(struct etna_bo *bo)
                        get_buffer_info(bo);
                }
 
-               bo->map = drm_mmap(0, bo->size, PROT_READ | PROT_WRITE,
-                               MAP_SHARED, bo->dev->fd, bo->offset);
+               bo->map = os_mmap(0, bo->size, PROT_READ | PROT_WRITE,
+                                 MAP_SHARED, bo->dev->fd, bo->offset);
                if (bo->map == MAP_FAILED) {
                        ERROR_MSG("mmap failed: %s", strerror(errno));
                        bo->map = NULL;