etnaviv: drm: Don't miscalculate timeout

[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 921ff4d37f744f37aa5cea8ab83f3d6a88e2e8be..32991d0a5b3915e598f5ae4d87c47893c43be5c8 100644 (file)
--- a/src/etnaviv/drm/etnaviv_device.c
+++ b/src/etnaviv/drm/etnaviv_device.c
@@ -24,35 +24,50 @@
  *    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 "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;
+
+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);
+       struct drm_etnaviv_param req = {
+               .param = ETNAVIV_PARAM_SOFTPIN_START_ADDR,
+       };
+       int ret;
 
        if (!dev)
                return NULL;
 
        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);
 
+       ret = drmCommandWriteRead(dev->fd, DRM_ETNAVIV_GET_PARAM, &req, sizeof(req));
+       if (!ret && req.value != ~0ULL) {
+               const uint64_t _4GB = 1ull << 32;
+
+               util_vma_heap_init(&dev->address_space, req.value, _4GB - req.value);
+               dev->use_softpin = 1;
+       }
+
        return dev;
 }
 
@@ -81,8 +96,12 @@ 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);
+
+       if (dev->use_softpin)
+               util_vma_heap_finish(&dev->address_space);
+
+       _mesa_hash_table_destroy(dev->handle_table, NULL);
+       _mesa_hash_table_destroy(dev->name_table, NULL);
 
        if (dev->closefd)
                close(dev->fd);
@@ -103,12 +122,17 @@ void etna_device_del(struct etna_device *dev)
        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);
 }
 
 int etna_device_fd(struct etna_device *dev)
 {
    return dev->fd;
 }
+
+bool etnaviv_device_softpin_capable(struct etna_device *dev)
+{
+       return !!dev->use_softpin;
+}