freedreno: use drm_mmap/drm_munmap wrappers

[platform/upstream/libdrm.git] / freedreno / freedreno_bo.c

diff --git a/freedreno/freedreno_bo.c b/freedreno/freedreno_bo.c
index 3a2e464..dacb34c 100644 (file)
--- a/freedreno/freedreno_bo.c
+++ b/freedreno/freedreno_bo.c
@@ -209,6 +209,25 @@ fd_bo_from_handle(struct fd_device *dev, uint32_t handle, uint32_t size)
        return bo;
 }
 
+drm_public struct fd_bo *
+fd_bo_from_dmabuf(struct fd_device *dev, int fd)
+{
+       struct drm_prime_handle req = {
+                       .fd = fd,
+       };
+       int ret, size;
+
+       ret = drmIoctl(dev->fd, DRM_IOCTL_PRIME_FD_TO_HANDLE, &req);
+       if (ret) {
+               return NULL;
+       }
+
+       /* hmm, would be nice if we had a way to figure out the size.. */
+       size = 0;
+
+       return fd_bo_from_handle(dev, req.handle, size);
+}
+
 drm_public struct fd_bo * fd_bo_from_name(struct fd_device *dev, uint32_t name)
 {
        struct drm_gem_open req = {
@@ -255,6 +274,11 @@ drm_public void fd_bo_del(struct fd_bo *bo)
        if (!atomic_dec_and_test(&bo->refcnt))
                return;
 
+       if (bo->fd) {
+               close(bo->fd);
+               bo->fd = 0;
+       }
+
        pthread_mutex_lock(&table_lock);
 
        if (bo->bo_reuse) {
@@ -288,7 +312,7 @@ out:
 static void bo_del(struct fd_bo *bo)
 {
        if (bo->map)
-               munmap(bo->map, bo->size);
+               drm_munmap(bo->map, bo->size);
 
        /* TODO probably bo's in bucket list get removed from
         * handle table??
@@ -335,6 +359,25 @@ drm_public uint32_t fd_bo_handle(struct fd_bo *bo)
        return bo->handle;
 }
 
+drm_public int fd_bo_dmabuf(struct fd_bo *bo)
+{
+       if (!bo->fd) {
+               struct drm_prime_handle req = {
+                               .handle = bo->handle,
+                               .flags = DRM_CLOEXEC,
+               };
+               int ret;
+
+               ret = drmIoctl(bo->dev->fd, DRM_IOCTL_PRIME_HANDLE_TO_FD, &req);
+               if (ret) {
+                       return ret;
+               }
+
+               bo->fd = req.fd;
+       }
+       return dup(bo->fd);
+}
+
 drm_public uint32_t fd_bo_size(struct fd_bo *bo)
 {
        return bo->size;
@@ -351,7 +394,7 @@ drm_public void * fd_bo_map(struct fd_bo *bo)
                        return NULL;
                }
 
-               bo->map = mmap(0, bo->size, PROT_READ | PROT_WRITE, MAP_SHARED,
+               bo->map = drm_mmap(0, bo->size, PROT_READ | PROT_WRITE, MAP_SHARED,
                                bo->dev->fd, offset);
                if (bo->map == MAP_FAILED) {
                        ERROR_MSG("mmap failed: %s", strerror(errno));