Mesa (master): etnaviv: drm: Use _mesa_hash_table instead of drmHash

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: c93007a6186fdcda68ac0738afe989e24936a496
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c93007a6186fdcda68ac0738afe989e24936a496

Author: Guido Günther <agx at sigxcpu.org>
Date:   Fri May 31 14:35:08 2019 +0200

etnaviv: drm: Use _mesa_hash_table instead of drmHash

Signed-off-by: Guido Günther <guido.gunther at puri.sm>
Reviewed-by: Christian Gmeiner <christian.gmeiner at gmail.com>

---

 src/etnaviv/drm/etnaviv_bo.c     | 14 ++++++++------
 src/etnaviv/drm/etnaviv_device.c | 31 +++++++++++++++++--------------
 2 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/src/etnaviv/drm/etnaviv_bo.c b/src/etnaviv/drm/etnaviv_bo.c
index abdd1817cce..096415afae3 100644
--- a/src/etnaviv/drm/etnaviv_bo.c
+++ b/src/etnaviv/drm/etnaviv_bo.c
@@ -25,6 +25,7 @@
  */
 
 #include "os/os_mman.h"
+#include "util/hash_table.h"
 
 #include "etnaviv_priv.h"
 #include "etnaviv_drmif.h"
@@ -37,7 +38,7 @@ 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 */
@@ -47,14 +48,14 @@ void bo_del(struct etna_bo *bo)
 		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);
 	}
 
@@ -65,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);
@@ -100,7 +102,7 @@ static struct etna_bo *bo_from_handle(struct etna_device *dev,
 	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;
 }
diff --git a/src/etnaviv/drm/etnaviv_device.c b/src/etnaviv/drm/etnaviv_device.c
index 921ff4d37f7..7dffb1cb3ab 100644
--- a/src/etnaviv/drm/etnaviv_device.c
+++ b/src/etnaviv/drm/etnaviv_device.c
@@ -24,22 +24,25 @@
  *    Christian Gmeiner <christian.gmeiner at 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 "util/hash_table.h"
 
 #include "etnaviv_priv.h"
 #include "etnaviv_drmif.h"
 
 static pthread_mutex_t table_lock = PTHREAD_MUTEX_INITIALIZER;
 
+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);
@@ -49,8 +52,8 @@ struct etna_device *etna_device_new(int fd)
 
 	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;
@@ -81,8 +84,8 @@ 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);