Merge remote-tracking branch 'freedesktop/master' into aosp/master

This merges the freedesktop/master branch into aosp/master

Change-Id: I3104d45924f67d37808154d04c15518394204478
Signed-off-by: John Stultz <john.stultz@linaro.org>

21 files changed, 310 insertions, 92 deletions

diff --git a/freedreno/Makefile.am b/freedreno/Makefile.am
index 0771d146..cbb0d031 100644
--- a/freedreno/Makefile.am
+++ b/freedreno/Makefile.am
@@ -5,6 +5,7 @@ AM_CFLAGS = \
         $(WARN_CFLAGS) \
         -I$(top_srcdir) \
         $(PTHREADSTUBS_CFLAGS) \
+        $(VALGRIND_CFLAGS) \
         -I$(top_srcdir)/include/drm
 
 libdrm_freedreno_la_LTLIBRARIES = libdrm_freedreno.la
diff --git a/freedreno/freedreno-symbol-check b/freedreno/freedreno-symbol-check
index 42f2c439..3b119528 100755
--- a/freedreno/freedreno-symbol-check
+++ b/freedreno/freedreno-symbol-check
@@ -3,7 +3,7 @@
 # The following symbols (past the first five) are taken from the public headers.
 # A list of the latter should be available Makefile.sources/LIBDRM_FREEDRENO_H_FILES
 
-FUNCS=$(nm -D --format=bsd --defined-only ${1-.libs/libdrm_freedreno.so} | awk '{print $3}'| while read func; do
+FUNCS=$($NM -D --format=bsd --defined-only ${1-.libs/libdrm_freedreno.so} | awk '{print $3}'| while read func; do
 ( grep -q "^$func$" || echo $func )  <<EOF
 __bss_start
 _edata
@@ -18,10 +18,12 @@ fd_bo_from_dmabuf
 fd_bo_from_fbdev
 fd_bo_from_handle
 fd_bo_from_name
+fd_bo_get_iova
 fd_bo_get_name
 fd_bo_handle
 fd_bo_map
 fd_bo_new
+fd_bo_put_iova
 fd_bo_ref
 fd_bo_size
 fd_device_del
@@ -33,6 +35,7 @@ fd_device_version
 fd_pipe_del
 fd_pipe_get_param
 fd_pipe_new
+fd_pipe_new2
 fd_pipe_wait
 fd_pipe_wait_timeout
 fd_ringbuffer_cmd_count
diff --git a/freedreno/freedreno_bo.c b/freedreno/freedreno_bo.c
index 996d6b95..34c285fb 100644
--- a/freedreno/freedreno_bo.c
+++ b/freedreno/freedreno_bo.c
@@ -26,10 +26,6 @@
  *    Rob Clark <robclark@freedesktop.org>
  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
 #include "freedreno_drmif.h"
 #include "freedreno_priv.h"
 
@@ -102,6 +98,8 @@ fd_bo_new(struct fd_device *dev, uint32_t size, uint32_t flags)
         bo->bo_reuse = TRUE;
         pthread_mutex_unlock(&table_lock);
 
+        VG_BO_ALLOC(bo);
+
         return bo;
 }
 
@@ -118,6 +116,8 @@ fd_bo_from_handle(struct fd_device *dev, uint32_t handle, uint32_t size)
 
         bo = bo_from_handle(dev, size, handle);
 
+        VG_BO_ALLOC(bo);
+
 out_unlock:
         pthread_mutex_unlock(&table_lock);
 
@@ -134,6 +134,7 @@ fd_bo_from_dmabuf(struct fd_device *dev, int fd)
         pthread_mutex_lock(&table_lock);
         ret = drmPrimeFDToHandle(dev->fd, fd, &handle);
         if (ret) {
+                pthread_mutex_unlock(&table_lock);
                 return NULL;
         }
 
@@ -147,6 +148,8 @@ fd_bo_from_dmabuf(struct fd_device *dev, int fd)
 
         bo = bo_from_handle(dev, size, handle);
 
+        VG_BO_ALLOC(bo);
+
 out_unlock:
         pthread_mutex_unlock(&table_lock);
 
@@ -177,8 +180,10 @@ struct fd_bo * fd_bo_from_name(struct fd_device *dev, uint32_t name)
                 goto out_unlock;
 
         bo = bo_from_handle(dev, req.size, req.handle);
-        if (bo)
+        if (bo) {
                 set_name(bo, name);
+                VG_BO_ALLOC(bo);
+        }
 
 out_unlock:
         pthread_mutex_unlock(&table_lock);
@@ -186,6 +191,16 @@ out_unlock:
         return bo;
 }
 
+uint64_t fd_bo_get_iova(struct fd_bo *bo)
+{
+        return bo->funcs->iova(bo);
+}
+
+void fd_bo_put_iova(struct fd_bo *bo)
+{
+        /* currently a no-op */
+}
+
 struct fd_bo * fd_bo_ref(struct fd_bo *bo)
 {
         atomic_inc(&bo->refcnt);
@@ -213,6 +228,8 @@ out:
 /* Called under table_lock */
 drm_private void bo_del(struct fd_bo *bo)
 {
+        VG_BO_FREE(bo);
+
         if (bo->map)
                 drm_munmap(bo->map, bo->size);
 
@@ -315,7 +332,7 @@ void fd_bo_cpu_fini(struct fd_bo *bo)
         bo->funcs->cpu_fini(bo);
 }
 
-#ifndef HAVE_FREEDRENO_KGSL
+#if !HAVE_FREEDRENO_KGSL
 struct fd_bo * fd_bo_from_fbdev(struct fd_pipe *pipe, int fbfd, uint32_t size)
 {
     return NULL;
diff --git a/freedreno/freedreno_bo_cache.c b/freedreno/freedreno_bo_cache.c
index 7becb0d6..3b737159 100644
--- a/freedreno/freedreno_bo_cache.c
+++ b/freedreno/freedreno_bo_cache.c
@@ -26,14 +26,9 @@
  *    Rob Clark <robclark@freedesktop.org>
  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
 #include "freedreno_drmif.h"
 #include "freedreno_priv.h"
 
-
 drm_private void bo_del(struct fd_bo *bo);
 drm_private extern pthread_mutex_t table_lock;
 
@@ -102,6 +97,7 @@ fd_bo_cache_cleanup(struct fd_bo_cache *cache, time_t time)
                         if (time && ((time - bo->free_time) <= 1))
                                 break;
 
+                        VG_BO_OBTAIN(bo);
                         list_del(&bo->list);
                         bo_del(bo);
                 }
@@ -177,6 +173,7 @@ retry:
                 *size = bucket->size;
                 bo = find_in_bucket(bucket, flags);
                 if (bo) {
+                        VG_BO_OBTAIN(bo);
                         if (bo->funcs->madvise(bo, TRUE) <= 0) {
                                 /* we've lost the backing pages, delete and try again: */
                                 pthread_mutex_lock(&table_lock);
@@ -207,6 +204,7 @@ fd_bo_cache_free(struct fd_bo_cache *cache, struct fd_bo *bo)
                 clock_gettime(CLOCK_MONOTONIC, &time);
 
                 bo->free_time = time.tv_sec;
+                VG_BO_RELEASE(bo);
                 list_addtail(&bo->list, &bucket->list);
                 fd_bo_cache_cleanup(cache, time.tv_sec);
 
diff --git a/freedreno/freedreno_device.c b/freedreno/freedreno_device.c
index fcbf1402..0b42561a 100644
--- a/freedreno/freedreno_device.c
+++ b/freedreno/freedreno_device.c
@@ -26,10 +26,6 @@
  *    Rob Clark <robclark@freedesktop.org>
  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
@@ -65,7 +61,7 @@ struct fd_device * fd_device_new(int fd)
 
                 dev = msm_device_new(fd);
                 dev->version = version->version_minor;
-#ifdef HAVE_FREEDRENO_KGSL
+#if HAVE_FREEDRENO_KGSL
         } else if (!strcmp(version->name, "kgsl")) {
                 DEBUG_MSG("kgsl DRM device");
                 dev = kgsl_device_new(fd);
@@ -112,12 +108,13 @@ struct fd_device * fd_device_ref(struct fd_device *dev)
 
 static void fd_device_del_impl(struct fd_device *dev)
 {
+        int close_fd = dev->closefd ? dev->fd : -1;
         fd_bo_cache_cleanup(&dev->bo_cache, 0);
         drmHashDestroy(dev->handle_table);
         drmHashDestroy(dev->name_table);
-        if (dev->closefd)
-                close(dev->fd);
         dev->funcs->destroy(dev);
+        if (close_fd >= 0)
+                close(close_fd);
 }
 
 drm_private void fd_device_del_locked(struct fd_device *dev)
diff --git a/freedreno/freedreno_drmif.h b/freedreno/freedreno_drmif.h
index 7a8073ff..2711518b 100644
--- a/freedreno/freedreno_drmif.h
+++ b/freedreno/freedreno_drmif.h
@@ -61,6 +61,7 @@ enum fd_param_id {
         FD_CHIP_ID,
         FD_MAX_FREQ,
         FD_TIMESTAMP,
+        FD_NR_RINGS,      /* # of rings == # of distinct priority levels */
 };
 
 /* bo flags: */
@@ -93,6 +94,8 @@ enum fd_version {
         FD_VERSION_MADVISE = 1,            /* kernel supports madvise */
         FD_VERSION_UNLIMITED_CMDS = 1,     /* submits w/ >4 cmd buffers (growable ringbuffer) */
         FD_VERSION_FENCE_FD = 2,           /* submit command supports in/out fences */
+        FD_VERSION_SUBMIT_QUEUES = 3,      /* submit queues and multiple priority levels */
+        FD_VERSION_BO_IOVA = 3,            /* supports fd_bo_get/put_iova() */
 };
 enum fd_version fd_device_version(struct fd_device *dev);
 
@@ -100,6 +103,7 @@ enum fd_version fd_device_version(struct fd_device *dev);
  */
 
 struct fd_pipe * fd_pipe_new(struct fd_device *dev, enum fd_pipe_id id);
+struct fd_pipe * fd_pipe_new2(struct fd_device *dev, enum fd_pipe_id id, uint32_t prio);
 void fd_pipe_del(struct fd_pipe *pipe);
 int fd_pipe_get_param(struct fd_pipe *pipe, enum fd_param_id param,
                 uint64_t *value);
@@ -120,6 +124,8 @@ struct fd_bo *fd_bo_from_handle(struct fd_device *dev,
                 uint32_t handle, uint32_t size);
 struct fd_bo * fd_bo_from_name(struct fd_device *dev, uint32_t name);
 struct fd_bo * fd_bo_from_dmabuf(struct fd_device *dev, int fd);
+uint64_t fd_bo_get_iova(struct fd_bo *bo);
+void fd_bo_put_iova(struct fd_bo *bo);
 struct fd_bo * fd_bo_ref(struct fd_bo *bo);
 void fd_bo_del(struct fd_bo *bo);
 int fd_bo_get_name(struct fd_bo *bo, uint32_t *name);
diff --git a/freedreno/freedreno_pipe.c b/freedreno/freedreno_pipe.c
index 3f8c8342..77b160e7 100644
--- a/freedreno/freedreno_pipe.c
+++ b/freedreno/freedreno_pipe.c
@@ -26,28 +26,33 @@
  *    Rob Clark <robclark@freedesktop.org>
  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
 #include "freedreno_drmif.h"
 #include "freedreno_priv.h"
 
+/**
+ * priority of zero is highest priority, and higher numeric values are
+ * lower priorities
+ */
 struct fd_pipe *
-fd_pipe_new(struct fd_device *dev, enum fd_pipe_id id)
+fd_pipe_new2(struct fd_device *dev, enum fd_pipe_id id, uint32_t prio)
 {
-        struct fd_pipe *pipe = NULL;
+        struct fd_pipe *pipe;
         uint64_t val;
 
         if (id > FD_PIPE_MAX) {
                 ERROR_MSG("invalid pipe id: %d", id);
-                goto fail;
+                return NULL;
+        }
+
+        if ((prio != 1) && (fd_device_version(dev) < FD_VERSION_SUBMIT_QUEUES)) {
+                ERROR_MSG("invalid priority!");
+                return NULL;
         }
 
-        pipe = dev->funcs->pipe_new(dev, id);
+        pipe = dev->funcs->pipe_new(dev, id, prio);
         if (!pipe) {
                 ERROR_MSG("allocation failed");
-                goto fail;
+                return NULL;
         }
 
         pipe->dev = dev;
@@ -57,10 +62,12 @@ fd_pipe_new(struct fd_device *dev, enum fd_pipe_id id)
         pipe->gpu_id = val;
 
         return pipe;
-fail:
-        if (pipe)
-                fd_pipe_del(pipe);
-        return NULL;
+}
+
+struct fd_pipe *
+fd_pipe_new(struct fd_device *dev, enum fd_pipe_id id)
+{
+        return fd_pipe_new2(dev, id, 1);
 }
 
 void fd_pipe_del(struct fd_pipe *pipe)
diff --git a/freedreno/freedreno_priv.h b/freedreno/freedreno_priv.h
index 32170391..6c9e509f 100644
--- a/freedreno/freedreno_priv.h
+++ b/freedreno/freedreno_priv.h
@@ -29,10 +29,6 @@
 #ifndef FREEDRENO_PRIV_H_
 #define FREEDRENO_PRIV_H_
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include <stdlib.h>
 #include <errno.h>
 #include <string.h>
@@ -49,6 +45,7 @@
 #include "xf86atomic.h"
 
 #include "util_double_list.h"
+#include "util_math.h"
 
 #include "freedreno_drmif.h"
 #include "freedreno_ringbuffer.h"
@@ -66,7 +63,8 @@ struct fd_device_funcs {
                         uint32_t flags, uint32_t *handle);
         struct fd_bo * (*bo_from_handle)(struct fd_device *dev,
                         uint32_t size, uint32_t handle);
-        struct fd_pipe * (*pipe_new)(struct fd_device *dev, enum fd_pipe_id id);
+        struct fd_pipe * (*pipe_new)(struct fd_device *dev, enum fd_pipe_id id,
+                        unsigned prio);
         void (*destroy)(struct fd_device *dev);
 };
 
@@ -102,6 +100,9 @@ struct fd_device {
         struct fd_bo_cache bo_cache;
 
         int closefd;        /* call close(fd) upon destruction */
+
+        /* just for valgrind: */
+        int bo_size;
 };
 
 drm_private void fd_bo_cache_init(struct fd_bo_cache *cache, int coarse);
@@ -152,6 +153,7 @@ struct fd_bo_funcs {
         int (*cpu_prep)(struct fd_bo *bo, struct fd_pipe *pipe, uint32_t op);
         void (*cpu_fini)(struct fd_bo *bo);
         int (*madvise)(struct fd_bo *bo, int willneed);
+        uint64_t (*iova)(struct fd_bo *bo);
         void (*destroy)(struct fd_bo *bo);
 };
 
@@ -169,7 +171,6 @@ struct fd_bo {
         time_t free_time;        /* time when added to bucket-list */
 };
 
-#define ALIGN(v,a) (((v) + (a) - 1) & ~((a) - 1))
 #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
 
 #define enable_debug 0  /* TODO make dynamic */
@@ -196,4 +197,57 @@ offset_bytes(void *end, void *start)
         return ((char *)end) - ((char *)start);
 }
 
+#if HAVE_VALGRIND
+#  include <memcheck.h>
+
+/*
+ * For tracking the backing memory (if valgrind enabled, we force a mmap
+ * for the purposes of tracking)
+ */
+static inline void VG_BO_ALLOC(struct fd_bo *bo)
+{
+        if (bo && RUNNING_ON_VALGRIND) {
+                VALGRIND_MALLOCLIKE_BLOCK(fd_bo_map(bo), bo->size, 0, 1);
+        }
+}
+
+static inline void VG_BO_FREE(struct fd_bo *bo)
+{
+        VALGRIND_FREELIKE_BLOCK(bo->map, 0);
+}
+
+/*
+ * For tracking bo structs that are in the buffer-cache, so that valgrind
+ * doesn't attribute ownership to the first one to allocate the recycled
+ * bo.
+ *
+ * Note that the list_head in fd_bo is used to track the buffers in cache
+ * so disable error reporting on the range while they are in cache so
+ * valgrind doesn't squawk about list traversal.
+ *
+ */
+static inline void VG_BO_RELEASE(struct fd_bo *bo)
+{
+        if (RUNNING_ON_VALGRIND) {
+                VALGRIND_DISABLE_ADDR_ERROR_REPORTING_IN_RANGE(bo, bo->dev->bo_size);
+                VALGRIND_MAKE_MEM_NOACCESS(bo, bo->dev->bo_size);
+                VALGRIND_FREELIKE_BLOCK(bo->map, 0);
+        }
+}
+static inline void VG_BO_OBTAIN(struct fd_bo *bo)
+{
+        if (RUNNING_ON_VALGRIND) {
+                VALGRIND_MAKE_MEM_DEFINED(bo, bo->dev->bo_size);
+                VALGRIND_ENABLE_ADDR_ERROR_REPORTING_IN_RANGE(bo, bo->dev->bo_size);
+                VALGRIND_MALLOCLIKE_BLOCK(bo->map, bo->size, 0, 1);
+        }
+}
+#else
+static inline void VG_BO_ALLOC(struct fd_bo *bo)   {}
+static inline void VG_BO_FREE(struct fd_bo *bo)    {}
+static inline void VG_BO_RELEASE(struct fd_bo *bo) {}
+static inline void VG_BO_OBTAIN(struct fd_bo *bo)  {}
+#endif
+
+
 #endif /* FREEDRENO_PRIV_H_ */
diff --git a/freedreno/freedreno_ringbuffer.c b/freedreno/freedreno_ringbuffer.c
index 7310f1fd..3834b51b 100644
--- a/freedreno/freedreno_ringbuffer.c
+++ b/freedreno/freedreno_ringbuffer.c
@@ -26,10 +26,6 @@
  *    Rob Clark <robclark@freedesktop.org>
  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
 #include <assert.h>
 
 #include "freedreno_drmif.h"
diff --git a/freedreno/kgsl/kgsl_bo.c b/freedreno/kgsl/kgsl_bo.c
index ab3485e3..c6d2d499 100644
--- a/freedreno/kgsl/kgsl_bo.c
+++ b/freedreno/kgsl/kgsl_bo.c
@@ -26,10 +26,6 @@
  *    Rob Clark <robclark@freedesktop.org>
  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
 #include "kgsl_priv.h"
 
 #include <linux/fb.h>
diff --git a/freedreno/kgsl/kgsl_device.c b/freedreno/kgsl/kgsl_device.c
index 175e8378..914f3412 100644
--- a/freedreno/kgsl/kgsl_device.c
+++ b/freedreno/kgsl/kgsl_device.c
@@ -26,10 +26,6 @@
  *    Rob Clark <robclark@freedesktop.org>
  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
@@ -61,5 +57,7 @@ drm_private struct fd_device * kgsl_device_new(int fd)
         dev = &kgsl_dev->base;
         dev->funcs = &funcs;
 
+        dev->bo_size = sizeof(struct kgsl_bo);
+
         return dev;
 }
diff --git a/freedreno/kgsl/kgsl_pipe.c b/freedreno/kgsl/kgsl_pipe.c
index 8a39eb49..0a8b6586 100644
--- a/freedreno/kgsl/kgsl_pipe.c
+++ b/freedreno/kgsl/kgsl_pipe.c
@@ -26,10 +26,6 @@
  *    Rob Clark <robclark@freedesktop.org>
  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
 #include "kgsl_priv.h"
 
 
@@ -52,6 +48,7 @@ static int kgsl_pipe_get_param(struct fd_pipe *pipe,
                 return 0;
         case FD_MAX_FREQ:
         case FD_TIMESTAMP:
+        case FD_NR_RINGS:
                 /* unsupported on kgsl */
                 return -1;
         default:
@@ -210,7 +207,7 @@ static int getprop(int fd, enum kgsl_property_type type,
 
 
 drm_private struct fd_pipe * kgsl_pipe_new(struct fd_device *dev,
-                enum fd_pipe_id id)
+                enum fd_pipe_id id, uint32_t prio)
 {
         static const char *paths[] = {
                         [FD_PIPE_3D] = "/dev/kgsl-3d0",
diff --git a/freedreno/kgsl/kgsl_priv.h b/freedreno/kgsl/kgsl_priv.h
index 6ab64965..41b13920 100644
--- a/freedreno/kgsl/kgsl_priv.h
+++ b/freedreno/kgsl/kgsl_priv.h
@@ -103,7 +103,7 @@ drm_private void kgsl_pipe_post_submit(struct kgsl_pipe *pipe,
 drm_private void kgsl_pipe_process_pending(struct kgsl_pipe *pipe,
                 uint32_t timestamp);
 drm_private struct fd_pipe * kgsl_pipe_new(struct fd_device *dev,
-                enum fd_pipe_id id);
+                enum fd_pipe_id id, uint32_t prio);
 
 drm_private struct fd_ringbuffer * kgsl_ringbuffer_new(struct fd_pipe *pipe,
                 uint32_t size);
diff --git a/freedreno/kgsl/kgsl_ringbuffer.c b/freedreno/kgsl/kgsl_ringbuffer.c
index e4696b1b..a756deda 100644
--- a/freedreno/kgsl/kgsl_ringbuffer.c
+++ b/freedreno/kgsl/kgsl_ringbuffer.c
@@ -26,10 +26,6 @@
  *    Rob Clark <robclark@freedesktop.org>
  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
 #include <assert.h>
 
 #include "freedreno_ringbuffer.h"
@@ -146,7 +142,7 @@ static int kgsl_ringbuffer_flush(struct fd_ringbuffer *ring, uint32_t *last_star
                 ibdesc.gpuaddr = kgsl_ring->bo->gpuaddr;
                 ibdesc.hostptr = kgsl_ring->bo->hostptr;
                 ibdesc.sizedwords = 0x145;
-                req.timestamp = (uint32_t)kgsl_ring->bo->hostptr;
+                req.timestamp = (uintptr_t)kgsl_ring->bo->hostptr;
         }
 
         do {
diff --git a/freedreno/meson.build b/freedreno/meson.build
new file mode 100644
index 00000000..015b7fb1
--- /dev/null
+++ b/freedreno/meson.build
@@ -0,0 +1,77 @@
+# Copyright © 2017-2018 Intel Corporation
+
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+files_freedreno = files(
+  'freedreno_device.c',
+  'freedreno_pipe.c',
+  'freedreno_ringbuffer.c',
+  'freedreno_bo.c',
+  'freedreno_bo_cache.c',
+  'msm/msm_bo.c',
+  'msm/msm_device.c',
+  'msm/msm_pipe.c',
+  'msm/msm_ringbuffer.c',
+)
+
+if with_freedreno_kgsl
+  files_freedreno += files(
+    'kgsl/kgsl_bo.c',
+    'kgsl/kgsl_device.c',
+    'kgsl/kgsl_pipe.c',
+    'kgsl/kgsl_ringbuffer.c',
+  )
+endif
+
+libdrm_freedreno = shared_library(
+  'drm_freedreno',
+  [files_freedreno, config_file],
+  c_args : warn_c_args,
+  include_directories : [inc_root, inc_drm],
+  dependencies : [dep_valgrind, dep_pthread_stubs, dep_rt, dep_atomic_ops],
+  link_with : libdrm,
+  version : '1.0.0',
+  install : true,
+)
+
+ext_libdrm_freedreno = declare_dependency(
+  link_with : [libdrm, libdrm_freedreno],
+  include_directories : [inc_drm, include_directories('.')],
+)
+
+install_headers(
+  'freedreno_drmif.h', 'freedreno_ringbuffer.h',
+  subdir : 'freedreno'
+)
+
+pkg.generate(
+  name : 'libdrm_freedreno',
+  libraries : libdrm_freedreno,
+  subdirs : ['.', 'libdrm', 'freedreno'],
+  version : meson.project_version(),
+  requires_private : 'libdrm',
+  description : 'Userspace interface to freedreno kernel DRM services',
+)
+
+test(
+  'freedreno-symbol-check',
+  prog_bash,
+  env : env_test,
+  args : [files('freedreno-symbol-check'), libdrm_freedreno]
+)
diff --git a/freedreno/msm/msm_bo.c b/freedreno/msm/msm_bo.c
index 72471df6..8b3d0bcb 100644
--- a/freedreno/msm/msm_bo.c
+++ b/freedreno/msm/msm_bo.c
@@ -26,10 +26,6 @@
  *    Rob Clark <robclark@freedesktop.org>
  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
 #include "msm_priv.h"
 
 static int bo_allocate(struct msm_bo *msm_bo)
@@ -108,6 +104,18 @@ static int msm_bo_madvise(struct fd_bo *bo, int willneed)
         return req.retained;
 }
 
+static uint64_t msm_bo_iova(struct fd_bo *bo)
+{
+        struct drm_msm_gem_info req = {
+                        .handle = bo->handle,
+                        .flags = MSM_INFO_IOVA,
+        };
+
+        drmCommandWriteRead(bo->dev->fd, DRM_MSM_GEM_INFO, &req, sizeof(req));
+
+        return req.offset;
+}
+
 static void msm_bo_destroy(struct fd_bo *bo)
 {
         struct msm_bo *msm_bo = to_msm_bo(bo);
@@ -120,6 +128,7 @@ static const struct fd_bo_funcs funcs = {
                 .cpu_prep = msm_bo_cpu_prep,
                 .cpu_fini = msm_bo_cpu_fini,
                 .madvise = msm_bo_madvise,
+                .iova = msm_bo_iova,
                 .destroy = msm_bo_destroy,
 };
 
diff --git a/freedreno/msm/msm_device.c b/freedreno/msm/msm_device.c
index 727baa44..7bb57677 100644
--- a/freedreno/msm/msm_device.c
+++ b/freedreno/msm/msm_device.c
@@ -26,10 +26,6 @@
  *    Rob Clark <robclark@freedesktop.org>
  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
@@ -64,5 +60,7 @@ drm_private struct fd_device * msm_device_new(int fd)
 
         fd_bo_cache_init(&msm_dev->ring_cache, TRUE);
 
+        dev->bo_size = sizeof(struct msm_bo);
+
         return dev;
 }
diff --git a/freedreno/msm/msm_drm.h b/freedreno/msm/msm_drm.h
index ed4c8d47..dac49e59 100644
--- a/freedreno/msm/msm_drm.h
+++ b/freedreno/msm/msm_drm.h
@@ -73,6 +73,8 @@ struct drm_msm_timespec {
 #define MSM_PARAM_CHIP_ID    0x03
 #define MSM_PARAM_MAX_FREQ   0x04
 #define MSM_PARAM_TIMESTAMP  0x05
+#define MSM_PARAM_GMEM_BASE  0x06
+#define MSM_PARAM_NR_RINGS   0x07
 
 struct drm_msm_param {
         __u32 pipe;           /* in, MSM_PIPE_x */
@@ -104,10 +106,14 @@ struct drm_msm_gem_new {
         __u32 handle;         /* out */
 };
 
+#define MSM_INFO_IOVA   0x01
+
+#define MSM_INFO_FLAGS (MSM_INFO_IOVA)
+
 struct drm_msm_gem_info {
         __u32 handle;         /* in */
-        __u32 pad;
-        __u64 offset;         /* out, offset to pass to mmap() */
+        __u32 flags;          /* in - combination of MSM_INFO_* flags */
+        __u64 offset;         /* out, mmap() offset or iova */
 };
 
 #define MSM_PREP_READ        0x01
@@ -167,7 +173,7 @@ struct drm_msm_gem_submit_cmd {
         __u32 size;           /* in, cmdstream size */
         __u32 pad;
         __u32 nr_relocs;      /* in, number of submit_reloc's */
-        __u64 __user relocs;  /* in, ptr to array of submit_reloc's */
+        __u64 relocs;         /* in, ptr to array of submit_reloc's */
 };
 
 /* Each buffer referenced elsewhere in the cmdstream submit (ie. the
@@ -211,9 +217,10 @@ struct drm_msm_gem_submit {
         __u32 fence;          /* out */
         __u32 nr_bos;         /* in, number of submit_bo's */
         __u32 nr_cmds;        /* in, number of submit_cmd's */
-        __u64 __user bos;     /* in, ptr to array of submit_bo's */
-        __u64 __user cmds;    /* in, ptr to array of submit_cmd's */
+        __u64 bos;            /* in, ptr to array of submit_bo's */
+        __u64 cmds;           /* in, ptr to array of submit_cmd's */
         __s32 fence_fd;       /* in/out fence fd (see MSM_SUBMIT_FENCE_FD_IN/OUT) */
+        __u32 queueid;         /* in, submitqueue id */
 };
 
 /* The normal way to synchronize with the GPU is just to CPU_PREP on
@@ -227,6 +234,7 @@ struct drm_msm_wait_fence {
         __u32 fence;          /* in */
         __u32 pad;
         struct drm_msm_timespec timeout;   /* in */
+        __u32 queueid;         /* in, submitqueue id */
 };
 
 /* madvise provides a way to tell the kernel in case a buffers contents
@@ -250,6 +258,20 @@ struct drm_msm_gem_madvise {
         __u32 retained;       /* out, whether backing store still exists */
 };
 
+/*
+ * Draw queues allow the user to set specific submission parameter. Command
+ * submissions specify a specific submitqueue to use.  ID 0 is reserved for
+ * backwards compatibility as a "default" submitqueue
+ */
+
+#define MSM_SUBMITQUEUE_FLAGS (0)
+
+struct drm_msm_submitqueue {
+        __u32 flags;   /* in, MSM_SUBMITQUEUE_x */
+        __u32 prio;    /* in, Priority level */
+        __u32 id;      /* out, identifier */
+};
+
 #define DRM_MSM_GET_PARAM              0x00
 /* placeholder:
 #define DRM_MSM_SET_PARAM              0x01
@@ -261,7 +283,11 @@ struct drm_msm_gem_madvise {
 #define DRM_MSM_GEM_SUBMIT             0x06
 #define DRM_MSM_WAIT_FENCE             0x07
 #define DRM_MSM_GEM_MADVISE            0x08
-#define DRM_MSM_NUM_IOCTLS             0x09
+/* placeholder:
+#define DRM_MSM_GEM_SVM_NEW            0x09
+ */
+#define DRM_MSM_SUBMITQUEUE_NEW        0x0A
+#define DRM_MSM_SUBMITQUEUE_CLOSE      0x0B
 
 #define DRM_IOCTL_MSM_GET_PARAM        DRM_IOWR(DRM_COMMAND_BASE + DRM_MSM_GET_PARAM, struct drm_msm_param)
 #define DRM_IOCTL_MSM_GEM_NEW          DRM_IOWR(DRM_COMMAND_BASE + DRM_MSM_GEM_NEW, struct drm_msm_gem_new)
@@ -271,6 +297,8 @@ struct drm_msm_gem_madvise {
 #define DRM_IOCTL_MSM_GEM_SUBMIT       DRM_IOWR(DRM_COMMAND_BASE + DRM_MSM_GEM_SUBMIT, struct drm_msm_gem_submit)
 #define DRM_IOCTL_MSM_WAIT_FENCE       DRM_IOW (DRM_COMMAND_BASE + DRM_MSM_WAIT_FENCE, struct drm_msm_wait_fence)
 #define DRM_IOCTL_MSM_GEM_MADVISE      DRM_IOWR(DRM_COMMAND_BASE + DRM_MSM_GEM_MADVISE, struct drm_msm_gem_madvise)
+#define DRM_IOCTL_MSM_SUBMITQUEUE_NEW    DRM_IOWR(DRM_COMMAND_BASE + DRM_MSM_SUBMITQUEUE_NEW, struct drm_msm_submitqueue)
+#define DRM_IOCTL_MSM_SUBMITQUEUE_CLOSE  DRM_IOW (DRM_COMMAND_BASE + DRM_MSM_SUBMITQUEUE_CLOSE, __u32)
 
 #if defined(__cplusplus)
 }
diff --git a/freedreno/msm/msm_pipe.c b/freedreno/msm/msm_pipe.c
index f872e245..f28778ef 100644
--- a/freedreno/msm/msm_pipe.c
+++ b/freedreno/msm/msm_pipe.c
@@ -26,10 +26,6 @@
  *    Rob Clark <robclark@freedesktop.org>
  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
 #include "msm_priv.h"
 
 static int query_param(struct fd_pipe *pipe, uint32_t param,
@@ -71,6 +67,8 @@ static int msm_pipe_get_param(struct fd_pipe *pipe,
                 return query_param(pipe, MSM_PARAM_MAX_FREQ, value);
         case FD_TIMESTAMP:
                 return query_param(pipe, MSM_PARAM_TIMESTAMP, value);
+        case FD_NR_RINGS:
+                return query_param(pipe, MSM_PARAM_NR_RINGS, value);
         default:
                 ERROR_MSG("invalid param id: %d", param);
                 return -1;
@@ -83,6 +81,7 @@ static int msm_pipe_wait(struct fd_pipe *pipe, uint32_t timestamp,
         struct fd_device *dev = pipe->dev;
         struct drm_msm_wait_fence req = {
                         .fence = timestamp,
+                        .queueid = to_msm_pipe(pipe)->queue_id,
         };
         int ret;
 
@@ -97,9 +96,48 @@ static int msm_pipe_wait(struct fd_pipe *pipe, uint32_t timestamp,
         return 0;
 }
 
+static int open_submitqueue(struct fd_pipe *pipe, uint32_t prio)
+{
+        struct drm_msm_submitqueue req = {
+                .flags = 0,
+                .prio = prio,
+        };
+        uint64_t nr_rings = 1;
+        int ret;
+
+        if (fd_device_version(pipe->dev) < FD_VERSION_SUBMIT_QUEUES) {
+                to_msm_pipe(pipe)->queue_id = 0;
+                return 0;
+        }
+
+        msm_pipe_get_param(pipe, FD_NR_RINGS, &nr_rings);
+
+        req.prio = MIN2(req.prio, MAX2(nr_rings, 1) - 1);
+
+        ret = drmCommandWriteRead(pipe->dev->fd, DRM_MSM_SUBMITQUEUE_NEW,
+                        &req, sizeof(req));
+        if (ret) {
+                ERROR_MSG("could not create submitqueue! %d (%s)", ret, strerror(errno));
+                return ret;
+        }
+
+        to_msm_pipe(pipe)->queue_id = req.id;
+        return 0;
+}
+
+static void close_submitqueue(struct fd_pipe *pipe, uint32_t queue_id)
+{
+        if (fd_device_version(pipe->dev) < FD_VERSION_SUBMIT_QUEUES)
+                return;
+
+        drmCommandWrite(pipe->dev->fd, DRM_MSM_SUBMITQUEUE_CLOSE,
+                        &queue_id, sizeof(queue_id));
+}
+
 static void msm_pipe_destroy(struct fd_pipe *pipe)
 {
         struct msm_pipe *msm_pipe = to_msm_pipe(pipe);
+        close_submitqueue(pipe, msm_pipe->queue_id);
         free(msm_pipe);
 }
 
@@ -122,7 +160,7 @@ static uint64_t get_param(struct fd_pipe *pipe, uint32_t param)
 }
 
 drm_private struct fd_pipe * msm_pipe_new(struct fd_device *dev,
-                enum fd_pipe_id id)
+                enum fd_pipe_id id, uint32_t prio)
 {
         static const uint32_t pipe_id[] = {
                         [FD_PIPE_3D] = MSM_PIPE_3D0,
@@ -157,6 +195,9 @@ drm_private struct fd_pipe * msm_pipe_new(struct fd_device *dev,
         INFO_MSG(" Chip-id:         0x%08x", msm_pipe->chip_id);
         INFO_MSG(" GMEM size:       0x%08x", msm_pipe->gmem);
 
+        if (open_submitqueue(pipe, prio))
+                goto fail;
+
         return pipe;
 fail:
         if (pipe)
diff --git a/freedreno/msm/msm_priv.h b/freedreno/msm/msm_priv.h
index 6d670aab..88ac3aa4 100644
--- a/freedreno/msm/msm_priv.h
+++ b/freedreno/msm/msm_priv.h
@@ -56,6 +56,7 @@ struct msm_pipe {
         uint32_t gpu_id;
         uint32_t gmem;
         uint32_t chip_id;
+        uint32_t queue_id;
 };
 
 static inline struct msm_pipe * to_msm_pipe(struct fd_pipe *x)
@@ -64,7 +65,7 @@ static inline struct msm_pipe * to_msm_pipe(struct fd_pipe *x)
 }
 
 drm_private struct fd_pipe * msm_pipe_new(struct fd_device *dev,
-                enum fd_pipe_id id);
+                enum fd_pipe_id id, uint32_t prio);
 
 drm_private struct fd_ringbuffer * msm_ringbuffer_new(struct fd_pipe *pipe,
                 uint32_t size);
diff --git a/freedreno/msm/msm_ringbuffer.c b/freedreno/msm/msm_ringbuffer.c
index 17194f4c..a87e1b9a 100644
--- a/freedreno/msm/msm_ringbuffer.c
+++ b/freedreno/msm/msm_ringbuffer.c
@@ -26,10 +26,6 @@
  *    Rob Clark <robclark@freedesktop.org>
  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
 #include <assert.h>
 #include <inttypes.h>
 
@@ -401,6 +397,7 @@ static int msm_ringbuffer_flush(struct fd_ringbuffer *ring, uint32_t *last_start
         struct msm_ringbuffer *msm_ring = to_msm_ringbuffer(ring);
         struct drm_msm_gem_submit req = {
                         .flags = to_msm_pipe(ring->pipe)->pipe,
+                        .queueid = to_msm_pipe(ring->pipe)->queue_id,
         };
         uint32_t i;
         int ret;
@@ -496,11 +493,16 @@ static void msm_ringbuffer_emit_reloc(struct fd_ringbuffer *ring,
         if (ring->pipe->gpu_id >= 500) {
                 struct drm_msm_gem_submit_reloc *reloc_hi;
 
+                /* NOTE: grab reloc_idx *before* APPEND() since that could
+                 * realloc() meaning that 'reloc' ptr is no longer valid:
+                 */
+                uint32_t reloc_idx = reloc->reloc_idx;
+
                 idx = APPEND(cmd, relocs);
 
                 reloc_hi = &cmd->relocs[idx];
 
-                reloc_hi->reloc_idx = reloc->reloc_idx;
+                reloc_hi->reloc_idx = reloc_idx;
                 reloc_hi->reloc_offset = r->offset;
                 reloc_hi->or = r->orhi;
                 reloc_hi->shift = r->shift - 32;
@@ -584,12 +586,12 @@ drm_private struct fd_ringbuffer * msm_ringbuffer_new(struct fd_pipe *pipe,
                 uint32_t size)
 {
         struct msm_ringbuffer *msm_ring;
-        struct fd_ringbuffer *ring = NULL;
+        struct fd_ringbuffer *ring;
 
         msm_ring = calloc(1, sizeof(*msm_ring));
         if (!msm_ring) {
                 ERROR_MSG("allocation failed");
-                goto fail;
+                return NULL;
         }
 
         if (size == 0) {
@@ -609,8 +611,4 @@ drm_private struct fd_ringbuffer * msm_ringbuffer_new(struct fd_pipe *pipe,
         ring_cmd_new(ring, size);
 
         return ring;
-fail:
-        if (ring)
-                fd_ringbuffer_del(ring);
-        return NULL;
 }