etnaviv: replace all dup() with os_dupfd_cloexec()

[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 c1833da5a9f160fc4ebfc2f948dbac4b35343ec4..8d56e9a4f1b9f0877caa935ea027f2f594b09c91 100644 (file)
--- a/src/etnaviv/drm/etnaviv_device.c
+++ b/src/etnaviv/drm/etnaviv_device.c
@@ -24,36 +24,39 @@
  *    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 "util/os_file.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;
 
 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;
 
-       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, _mesa_hash_u32, _mesa_key_u32_equal);
+       dev->name_table = _mesa_hash_table_create(NULL, _mesa_hash_u32, _mesa_key_u32_equal);
        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;
 }
 
@@ -61,7 +64,7 @@ struct etna_device *etna_device_new(int fd)
  * which is close()d when the device is finalized. */
 struct etna_device *etna_device_new_dup(int fd)
 {
-       int dup_fd = dup(fd);
+       int dup_fd = os_dupfd_cloexec(fd);
        struct etna_device *dev = etna_device_new(dup_fd);
 
        if (dev)
@@ -74,7 +77,7 @@ struct etna_device *etna_device_new_dup(int fd)
 
 struct etna_device *etna_device_ref(struct etna_device *dev)
 {
-       atomic_inc(&dev->refcnt);
+       p_atomic_inc(&dev->refcnt);
 
        return dev;
 }
@@ -82,8 +85,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);
@@ -93,7 +100,7 @@ static void etna_device_del_impl(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);
@@ -101,15 +108,20 @@ void etna_device_del_locked(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);
 }
 
 int etna_device_fd(struct etna_device *dev)
 {
    return dev->fd;
 }
+
+bool etnaviv_device_softpin_capable(struct etna_device *dev)
+{
+       return !!dev->use_softpin;
+}