v3d: Introduce a DRM shim for calling out to the simulator.

The goal is to enable testing of parts of drivers without depending on any
particular kernel version or hardware being present.

Simply set LD_PRELOAD=$PREFIX/lib/libv3d_drm_shim.so in your environment,
and we'll fake a /dev/dri/renderD128 (or whatever the next available node
is) using v3dv3.  That node can then be used with the surfaceless or gbm
EGL platforms.

Acked-by: Iago Toral Quiroga <[email protected]>

7 files changed, 779 insertions, 0 deletions

diff --git a/src/broadcom/drm-shim/README.md b/src/broadcom/drm-shim/README.md
new file mode 100644
index 00000000000..dde21c1b838
--- /dev/null
+++ b/src/broadcom/drm-shim/README.md
@@ -0,0 +1,17 @@
+### v3d backend
+
+This implements some of v3d using the closed source v3dv3 tree's
+C/C++-based simulator.  All execution is synchronous.
+
+Export: `MESA_LOADER_DRIVER_OVERRIDE=v3d
+LD_PRELOAD=$prefix/lib/libv3d_drm_shim.so`.  The v3dv3 version exposed
+will depend on the v3dv3 build -- 3.3, 4.1, and 4.2 are supported.
+
+### v3d_noop backend
+
+This implements the minimum of v3d in order to make shader-db work.
+The submit ioctl is stubbed out to not execute anything.
+
+Export `MESA_LOADER_DRIVER_OVERRIDE=v3d
+LD_PRELOAD=$prefix/lib/libv3d_noop_drm_shim.so`.  This will be a V3D
+4.2 device.
diff --git a/src/broadcom/drm-shim/meson.build b/src/broadcom/drm-shim/meson.build
new file mode 100644
index 00000000000..2c2e4c5eb2e
--- /dev/null
+++ b/src/broadcom/drm-shim/meson.build
@@ -0,0 +1,62 @@
+# Copyright © 2019 Broadcom
+#
+# 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.
+
+libv3d_noop_drm_shim = shared_library(
+  ['v3d_noop_drm_shim'],
+  'v3d_noop.c',
+  include_directories: inc_common,
+  dependencies: dep_drm_shim,
+  c_args : c_vis_args,
+  install : true,
+)
+
+dep_v3dv3 = dependency('v3dv3', required: false)
+if dep_v3dv3.found()
+  v3dv3_c_args = '-DUSE_V3D_SIMULATOR'
+
+  inc_gallium_v3d = include_directories('../../gallium/drivers/v3d')
+
+  per_version_libs = []
+  foreach ver : v3d_versions
+    per_version_libs += static_library(
+        'libv3d_drm_shim-v' + ver,
+        [
+                            'v3dx.c',
+                            v3d_xml_pack
+        ],
+        include_directories : [inc_common, inc_broadcom, inc_src, inc_gallium_v3d],
+        c_args : [c_vis_args, no_override_init_args, '-DV3D_VERSION=' + ver, v3dv3_c_args],
+        dependencies: [dep_valgrind, dep_thread, dep_v3dv3],
+    )
+  endforeach
+
+  libv3d_drm_shim = shared_library(
+    ['v3d_drm_shim'],
+    [
+      'v3d.c',
+      '../../gallium/drivers/v3d/v3d_simulator_wrapper.cpp',
+    ],
+    dependencies: [dep_dl, dep_drm_shim, dep_v3dv3],
+    link_with: [libmesa_util, per_version_libs],
+    include_directories : [inc_common, inc_broadcom, inc_gallium_v3d],
+    c_args : [c_vis_args, no_override_init_args, '-std=gnu99', v3dv3_c_args],
+    cpp_args : [v3dv3_c_args]
+  )
+endif
diff --git a/src/broadcom/drm-shim/v3d.c b/src/broadcom/drm-shim/v3d.c
new file mode 100644
index 00000000000..e75657f59f7
--- /dev/null
+++ b/src/broadcom/drm-shim/v3d.c
@@ -0,0 +1,98 @@
+/*
+ * Copyright © 2018 Broadcom
+ *
+ * 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 (including the next
+ * paragraph) 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.
+ */
+
+#include <stdio.h>
+#include <sys/ioctl.h>
+#include "drm-uapi/v3d_drm.h"
+#include "drm-shim/drm_shim.h"
+#include "v3d.h"
+#include "v3d_simulator_wrapper.h"
+
+static struct v3d_device_info devinfo;
+struct v3d_shim_device v3d = {
+        .devinfo = &devinfo
+};
+
+struct v3d_bo *v3d_bo_lookup(struct shim_fd *shim_fd, int handle)
+{
+        return v3d_bo(drm_shim_bo_lookup(shim_fd, handle));
+}
+
+int
+v3d_ioctl_wait_bo(int fd, unsigned long request, void *arg)
+{
+        /* No need to wait on anything yet, given that we submit
+         * synchronously.
+         */
+        return 0;
+}
+
+int
+v3d_ioctl_mmap_bo(int fd, unsigned long request, void *arg)
+{
+        struct shim_fd *shim_fd = drm_shim_fd_lookup(fd);
+        struct drm_v3d_mmap_bo *map = arg;
+        struct shim_bo *bo = drm_shim_bo_lookup(shim_fd, map->handle);
+
+        map->offset = drm_shim_bo_get_mmap_offset(shim_fd, bo);
+
+        drm_shim_bo_put(bo);
+
+        return 0;
+}
+
+int
+v3d_ioctl_get_bo_offset(int fd, unsigned long request, void *arg)
+{
+        struct shim_fd *shim_fd = drm_shim_fd_lookup(fd);
+        struct drm_v3d_get_bo_offset *get = arg;
+        struct v3d_bo *bo = v3d_bo_lookup(shim_fd, get->handle);
+
+        get->offset = bo->offset;
+
+        drm_shim_bo_put(&bo->base);
+
+        return 0;
+}
+
+void
+drm_shim_driver_init(void)
+{
+        shim_device.driver_name = "v3d";
+
+        drm_shim_override_file("OF_FULLNAME=/rdb/v3d\n"
+                               "OF_COMPATIBLE_N=1\n"
+                               "OF_COMPATIBLE_0=brcm,7278-v3d\n",
+                               "/sys/dev/char/%d:%d/device/uevent",
+                               DRM_MAJOR, render_node_minor);
+
+        v3d.hw = v3d_hw_auto_new(NULL);
+        v3d.devinfo->ver = v3d_hw_get_version(v3d.hw);
+
+        if (v3d.devinfo->ver >= 42)
+                v3d42_drm_shim_driver_init();
+        else if (v3d.devinfo->ver >= 41)
+                v3d41_drm_shim_driver_init();
+        else
+                v3d33_drm_shim_driver_init();
+}
diff --git a/src/broadcom/drm-shim/v3d.h b/src/broadcom/drm-shim/v3d.h
new file mode 100644
index 00000000000..0712b8b3f24
--- /dev/null
+++ b/src/broadcom/drm-shim/v3d.h
@@ -0,0 +1,70 @@
+/*
+ * Copyright © 2018 Broadcom
+ *
+ * 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 (including the next
+ * paragraph) 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.
+ */
+
+#ifndef DRM_SHIM_V3D_H
+#define DRM_SHIM_V3D_H
+
+#include "broadcom/common/v3d_device_info.h"
+#include "util/vma.h"
+
+struct drm_shim_fd;
+
+struct v3d_shim_device {
+        struct v3d_hw *hw;
+        struct v3d_device_info *devinfo;
+
+        /* Base virtual address of the heap. */
+        void *mem;
+        /* Base hardware address of the heap. */
+        uint32_t mem_base;
+        /* Size of the heap. */
+        size_t mem_size;
+
+        /* Allocator for the GPU virtual addresses. */
+        struct util_vma_heap heap;
+};
+extern struct v3d_shim_device v3d;
+
+struct v3d_bo {
+        struct shim_bo base;
+        uint64_t offset;
+        void *sim_vaddr;
+        void *gem_vaddr;
+};
+
+static inline struct v3d_bo *
+v3d_bo(struct shim_bo *bo)
+{
+        return (struct v3d_bo *)bo;
+}
+
+struct v3d_bo *v3d_bo_lookup(struct shim_fd *shim_fd, int handle);
+int v3d_ioctl_wait_bo(int fd, unsigned long request, void *arg);
+int v3d_ioctl_mmap_bo(int fd, unsigned long request, void *arg);
+int v3d_ioctl_get_bo_offset(int fd, unsigned long request, void *arg);
+
+void v3d33_drm_shim_driver_init(void);
+void v3d41_drm_shim_driver_init(void);
+void v3d42_drm_shim_driver_init(void);
+
+#endif /* DRM_SHIM_V3D_H */
diff --git a/src/broadcom/drm-shim/v3d_noop.c b/src/broadcom/drm-shim/v3d_noop.c
new file mode 100644
index 00000000000..7c7d751285d
--- /dev/null
+++ b/src/broadcom/drm-shim/v3d_noop.c
@@ -0,0 +1,158 @@
+/*
+ * Copyright © 2018 Broadcom
+ *
+ * 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 (including the next
+ * paragraph) 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.
+ */
+
+#include <limits.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/ioctl.h>
+#include "drm-uapi/v3d_drm.h"
+#include "drm-shim/drm_shim.h"
+
+struct v3d_bo {
+        struct shim_bo base;
+        uint32_t offset;
+};
+
+static struct v3d_bo *
+v3d_bo(struct shim_bo *bo)
+{
+        return (struct v3d_bo *)bo;
+}
+
+struct v3d_device {
+        uint32_t next_offset;
+};
+
+static struct v3d_device v3d = {
+        .next_offset = 0x1000,
+};
+
+static int
+v3d_ioctl_noop(int fd, unsigned long request, void *arg)
+{
+        return 0;
+}
+
+static int
+v3d_ioctl_create_bo(int fd, unsigned long request, void *arg)
+{
+        struct shim_fd *shim_fd = drm_shim_fd_lookup(fd);
+        struct drm_v3d_create_bo *create = arg;
+        struct v3d_bo *bo = calloc(1, sizeof(*bo));
+
+        drm_shim_bo_init(&bo->base, create->size);
+
+        assert(UINT_MAX - v3d.next_offset > create->size);
+        bo->offset = v3d.next_offset;
+        v3d.next_offset += create->size;
+
+        create->offset = bo->offset;
+        create->handle = drm_shim_bo_get_handle(shim_fd, &bo->base);
+
+        drm_shim_bo_put(&bo->base);
+
+        return 0;
+}
+
+static int
+v3d_ioctl_get_bo_offset(int fd, unsigned long request, void *arg)
+{
+        struct shim_fd *shim_fd = drm_shim_fd_lookup(fd);
+        struct drm_v3d_get_bo_offset *args = arg;
+        struct shim_bo *bo = drm_shim_bo_lookup(shim_fd, args->handle);
+
+        args->offset = v3d_bo(bo)->offset;
+
+        drm_shim_bo_put(bo);
+
+        return 0;
+}
+
+static int
+v3d_ioctl_mmap_bo(int fd, unsigned long request, void *arg)
+{
+        struct shim_fd *shim_fd = drm_shim_fd_lookup(fd);
+        struct drm_v3d_mmap_bo *map = arg;
+        struct shim_bo *bo = drm_shim_bo_lookup(shim_fd, map->handle);
+
+        map->offset = drm_shim_bo_get_mmap_offset(shim_fd, bo);
+
+        drm_shim_bo_put(bo);
+
+        return 0;
+}
+
+static int
+v3d_ioctl_get_param(int fd, unsigned long request, void *arg)
+{
+        struct drm_v3d_get_param *gp = arg;
+        static const uint32_t v3d42_reg_map[] = {
+                [DRM_V3D_PARAM_V3D_UIFCFG] = 0x00000045,
+                [DRM_V3D_PARAM_V3D_HUB_IDENT1] = 0x000e1124,
+                [DRM_V3D_PARAM_V3D_HUB_IDENT2] = 0x00000100,
+                [DRM_V3D_PARAM_V3D_HUB_IDENT3] = 0x00000e00,
+                [DRM_V3D_PARAM_V3D_CORE0_IDENT0] = 0x04443356,
+                [DRM_V3D_PARAM_V3D_CORE0_IDENT1] = 0x81001422,
+                [DRM_V3D_PARAM_V3D_CORE0_IDENT2] = 0x40078121,
+        };
+
+        switch (gp->param) {
+        case DRM_V3D_PARAM_SUPPORTS_TFU:
+                gp->value = 1;
+                return 0;
+        default:
+                break;
+        }
+
+        if (gp->param < ARRAY_SIZE(v3d42_reg_map) && v3d42_reg_map[gp->param]) {
+                gp->value = v3d42_reg_map[gp->param];
+                return 0;
+        }
+
+        fprintf(stderr, "Unknown DRM_IOCTL_V3D_GET_PARAM %d\n", gp->param);
+        return -1;
+}
+
+static ioctl_fn_t driver_ioctls[] = {
+        [DRM_V3D_SUBMIT_CL] = v3d_ioctl_noop,
+        [DRM_V3D_SUBMIT_TFU] = v3d_ioctl_noop,
+        [DRM_V3D_WAIT_BO] = v3d_ioctl_noop,
+        [DRM_V3D_CREATE_BO] = v3d_ioctl_create_bo,
+        [DRM_V3D_GET_PARAM] = v3d_ioctl_get_param,
+        [DRM_V3D_GET_BO_OFFSET] = v3d_ioctl_get_bo_offset,
+        [DRM_V3D_MMAP_BO] = v3d_ioctl_mmap_bo,
+};
+
+void
+drm_shim_driver_init(void)
+{
+        shim_device.driver_name = "v3d";
+        shim_device.driver_ioctls = driver_ioctls;
+        shim_device.driver_ioctl_count = ARRAY_SIZE(driver_ioctls);
+
+        drm_shim_override_file("OF_FULLNAME=/rdb/v3d\n"
+                               "OF_COMPATIBLE_N=1\n"
+                               "OF_COMPATIBLE_0=brcm,7278-v3d\n",
+                               "/sys/dev/char/%d:%d/device/uevent",
+                               DRM_MAJOR, render_node_minor);
+}
diff --git a/src/broadcom/drm-shim/v3dx.c b/src/broadcom/drm-shim/v3dx.c
new file mode 100644
index 00000000000..a22550a03a5
--- /dev/null
+++ b/src/broadcom/drm-shim/v3dx.c
@@ -0,0 +1,370 @@
+/*
+ * Copyright © 2014-2017 Broadcom
+ *
+ * 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 (including the next
+ * paragraph) 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.
+ */
+
+/* @file
+ *
+ * v3d driver code interacting v3dv3 simulator/fpga library.
+ *
+ * This is compiled per V3D version we support, since the register definitions
+ * conflict.
+ */
+
+#include <errno.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <string.h>
+#include <sys/mman.h>
+#include "util/macros.h"
+#include "util/u_mm.h"
+#include "broadcom/common/v3d_macros.h"
+#include "v3d_simulator_wrapper.h"
+#include "drm-shim/drm_shim.h"
+#include "drm-uapi/v3d_drm.h"
+#include "v3d.h"
+
+#define HW_REGISTER_RO(x) (x)
+#define HW_REGISTER_RW(x) (x)
+#if V3D_VERSION >= 41
+#include "libs/core/v3d/registers/4.1.34.0/v3d.h"
+#else
+#include "libs/core/v3d/registers/3.3.0.0/v3d.h"
+#endif
+
+#define V3D_WRITE(reg, val) v3d_hw_write_reg(v3d.hw, reg, val)
+#define V3D_READ(reg) v3d_hw_read_reg(v3d.hw, reg)
+
+static void
+v3d_flush_l3()
+{
+        if (!v3d_hw_has_gca(v3d.hw))
+                return;
+
+#if V3D_VERSION < 40
+        uint32_t gca_ctrl = V3D_READ(V3D_GCA_CACHE_CTRL);
+
+        V3D_WRITE(V3D_GCA_CACHE_CTRL, gca_ctrl | V3D_GCA_CACHE_CTRL_FLUSH_SET);
+        V3D_WRITE(V3D_GCA_CACHE_CTRL, gca_ctrl & ~V3D_GCA_CACHE_CTRL_FLUSH_SET);
+#endif
+}
+
+/* Invalidates the L2 cache.  This is a read-only cache. */
+static void
+v3d_flush_l2(void)
+{
+        V3D_WRITE(V3D_CTL_0_L2CACTL,
+                  V3D_CTL_0_L2CACTL_L2CCLR_SET |
+                  V3D_CTL_0_L2CACTL_L2CENA_SET);
+}
+
+/* Invalidates texture L2 cachelines */
+static void
+v3d_flush_l2t(void)
+{
+        V3D_WRITE(V3D_CTL_0_L2TFLSTA, 0);
+        V3D_WRITE(V3D_CTL_0_L2TFLEND, ~0);
+        V3D_WRITE(V3D_CTL_0_L2TCACTL,
+                  V3D_CTL_0_L2TCACTL_L2TFLS_SET |
+                  (0 << V3D_CTL_0_L2TCACTL_L2TFLM_LSB));
+}
+
+/* Invalidates the slice caches.  These are read-only caches. */
+static void
+v3d_flush_slices(void)
+{
+        V3D_WRITE(V3D_CTL_0_SLCACTL, ~0);
+}
+
+static void
+v3d_flush_caches(void)
+{
+        v3d_flush_l3();
+        v3d_flush_l2();
+        v3d_flush_l2t();
+        v3d_flush_slices();
+}
+
+static void
+v3d_simulator_copy_in_handle(struct shim_fd *shim_fd, int handle)
+{
+        if (!handle)
+                return;
+
+        struct v3d_bo *bo = v3d_bo_lookup(shim_fd, handle);
+
+        memcpy(bo->sim_vaddr, bo->gem_vaddr, bo->base.size);
+}
+
+static void
+v3d_simulator_copy_out_handle(struct shim_fd *shim_fd, int handle)
+{
+        if (!handle)
+                return;
+
+        struct v3d_bo *bo = v3d_bo_lookup(shim_fd, handle);
+
+        memcpy(bo->gem_vaddr, bo->sim_vaddr, bo->base.size);
+}
+
+static int
+v3dX(v3d_ioctl_submit_cl)(int fd, unsigned long request, void *arg)
+{
+        struct shim_fd *shim_fd = drm_shim_fd_lookup(fd);
+        struct drm_v3d_submit_cl *submit = arg;
+        uint32_t *bo_handles = (uint32_t *)(uintptr_t)submit->bo_handles;
+
+        for (int i = 0; i < submit->bo_handle_count; i++)
+                v3d_simulator_copy_in_handle(shim_fd, bo_handles[i]);
+
+        v3d_flush_caches();
+
+        if (submit->qma) {
+                V3D_WRITE(V3D_CLE_0_CT0QMA, submit->qma);
+                V3D_WRITE(V3D_CLE_0_CT0QMS, submit->qms);
+        }
+#if V3D_VERSION >= 41
+        if (submit->qts) {
+                V3D_WRITE(V3D_CLE_0_CT0QTS,
+                          V3D_CLE_0_CT0QTS_CTQTSEN_SET |
+                          submit->qts);
+        }
+#endif
+
+        fprintf(stderr, "submit %x..%x!\n", submit->bcl_start, submit->bcl_end);
+
+        V3D_WRITE(V3D_CLE_0_CT0QBA, submit->bcl_start);
+        V3D_WRITE(V3D_CLE_0_CT0QEA, submit->bcl_end);
+
+        /* Wait for bin to complete before firing render, as it seems the
+         * simulator doesn't implement the semaphores.
+         */
+        while (V3D_READ(V3D_CLE_0_CT0CA) !=
+               V3D_READ(V3D_CLE_0_CT0EA)) {
+                v3d_hw_tick(v3d.hw);
+        }
+
+        fprintf(stderr, "submit %x..%x!\n", submit->rcl_start, submit->rcl_end);
+
+        v3d_flush_caches();
+
+        V3D_WRITE(V3D_CLE_0_CT1QBA, submit->rcl_start);
+        V3D_WRITE(V3D_CLE_0_CT1QEA, submit->rcl_end);
+
+        while (V3D_READ(V3D_CLE_0_CT1CA) !=
+               V3D_READ(V3D_CLE_0_CT1EA)) {
+                v3d_hw_tick(v3d.hw);
+        }
+
+        for (int i = 0; i < submit->bo_handle_count; i++)
+                v3d_simulator_copy_out_handle(shim_fd, bo_handles[i]);
+
+        return 0;
+}
+
+static int
+v3dX(v3d_ioctl_submit_tfu)(int fd, unsigned long request, void *arg)
+{
+        struct shim_fd *shim_fd = drm_shim_fd_lookup(fd);
+        struct drm_v3d_submit_tfu *submit = arg;
+
+        v3d_simulator_copy_in_handle(shim_fd, submit->bo_handles[0]);
+        v3d_simulator_copy_in_handle(shim_fd, submit->bo_handles[1]);
+        v3d_simulator_copy_in_handle(shim_fd, submit->bo_handles[2]);
+        v3d_simulator_copy_in_handle(shim_fd, submit->bo_handles[3]);
+
+        int last_vtct = V3D_READ(V3D_TFU_CS) & V3D_TFU_CS_CVTCT_SET;
+
+        V3D_WRITE(V3D_TFU_IIA, submit->iia);
+        V3D_WRITE(V3D_TFU_IIS, submit->iis);
+        V3D_WRITE(V3D_TFU_ICA, submit->ica);
+        V3D_WRITE(V3D_TFU_IUA, submit->iua);
+        V3D_WRITE(V3D_TFU_IOA, submit->ioa);
+        V3D_WRITE(V3D_TFU_IOS, submit->ios);
+        V3D_WRITE(V3D_TFU_COEF0, submit->coef[0]);
+        V3D_WRITE(V3D_TFU_COEF1, submit->coef[1]);
+        V3D_WRITE(V3D_TFU_COEF2, submit->coef[2]);
+        V3D_WRITE(V3D_TFU_COEF3, submit->coef[3]);
+
+        V3D_WRITE(V3D_TFU_ICFG, submit->icfg);
+
+        while ((V3D_READ(V3D_TFU_CS) & V3D_TFU_CS_CVTCT_SET) == last_vtct) {
+                v3d_hw_tick(v3d.hw);
+        }
+
+        v3d_simulator_copy_out_handle(shim_fd, submit->bo_handles[0]);
+
+        return 0;
+}
+
+static int
+v3dX(v3d_ioctl_create_bo)(int fd, unsigned long request, void *arg)
+{
+        struct shim_fd *shim_fd = drm_shim_fd_lookup(fd);
+        struct drm_v3d_create_bo *create = arg;
+        struct v3d_bo *bo = calloc(1, sizeof(*bo));
+
+        drm_shim_bo_init(&bo->base, create->size);
+        bo->offset = util_vma_heap_alloc(&v3d.heap, create->size, 4096);
+        if (bo->offset == 0)
+                return -ENOMEM;
+
+        bo->sim_vaddr = v3d.mem + bo->offset - v3d.mem_base;
+#if 0
+        /* Place a mapping of the BO inside of the simulator's address space
+         * for V3D memory.  This lets us avoid copy in/out for simpenrose, but
+         * I'm betting we'll need something else for FPGA.
+         */
+        void *sim_addr = v3d.mem + bo->block->ofs;
+        void *mmap_ret = mmap(sim_addr, create->size, PROT_READ | PROT_WRITE,
+                              MAP_SHARED | MAP_FIXED, bo->base.fd, 0);
+        assert(mmap_ret == sim_addr);
+#else
+        /* Make a simulator-private mapping of the shim GEM object. */
+        bo->gem_vaddr = mmap(NULL, bo->base.size,
+                             PROT_READ | PROT_WRITE,
+                             MAP_SHARED,
+                             bo->base.fd, 0);
+        if (bo->gem_vaddr == MAP_FAILED) {
+                fprintf(stderr, "v3d: mmap of shim bo failed\n");
+                abort();
+        }
+#endif
+
+        create->offset = bo->offset;
+        create->handle = drm_shim_bo_get_handle(shim_fd, &bo->base);
+
+        drm_shim_bo_put(&bo->base);
+
+        return 0;
+}
+
+static int
+v3dX(v3d_ioctl_get_param)(int fd, unsigned long request, void *arg)
+{
+        struct drm_v3d_get_param *gp = arg;
+        static const uint32_t reg_map[] = {
+                [DRM_V3D_PARAM_V3D_UIFCFG] = V3D_HUB_CTL_UIFCFG,
+                [DRM_V3D_PARAM_V3D_HUB_IDENT1] = V3D_HUB_CTL_IDENT1,
+                [DRM_V3D_PARAM_V3D_HUB_IDENT2] = V3D_HUB_CTL_IDENT2,
+                [DRM_V3D_PARAM_V3D_HUB_IDENT3] = V3D_HUB_CTL_IDENT3,
+                [DRM_V3D_PARAM_V3D_CORE0_IDENT0] = V3D_CTL_0_IDENT0,
+                [DRM_V3D_PARAM_V3D_CORE0_IDENT1] = V3D_CTL_0_IDENT1,
+                [DRM_V3D_PARAM_V3D_CORE0_IDENT2] = V3D_CTL_0_IDENT2,
+        };
+
+        switch (gp->param) {
+        case DRM_V3D_PARAM_SUPPORTS_TFU:
+                gp->value = 1;
+                return 0;
+        }
+
+        if (gp->param < ARRAY_SIZE(reg_map) && reg_map[gp->param]) {
+                gp->value = V3D_READ(reg_map[gp->param]);
+                return 0;
+        }
+
+        fprintf(stderr, "Unknown DRM_IOCTL_V3D_GET_PARAM %d\n", gp->param);
+        return -1;
+}
+
+static ioctl_fn_t driver_ioctls[] = {
+        [DRM_V3D_SUBMIT_CL] = v3dX(v3d_ioctl_submit_cl),
+        [DRM_V3D_SUBMIT_TFU] = v3dX(v3d_ioctl_submit_tfu),
+        [DRM_V3D_WAIT_BO] = v3d_ioctl_wait_bo,
+        [DRM_V3D_CREATE_BO] = v3dX(v3d_ioctl_create_bo),
+        [DRM_V3D_GET_PARAM] = v3dX(v3d_ioctl_get_param),
+        [DRM_V3D_MMAP_BO] = v3d_ioctl_mmap_bo,
+        [DRM_V3D_GET_BO_OFFSET] = v3d_ioctl_get_bo_offset,
+};
+
+static void
+v3d_isr(uint32_t hub_status)
+{
+        /* Check the per-core bits */
+        if (hub_status & (1 << 0)) {
+                uint32_t core_status = V3D_READ(V3D_CTL_0_INT_STS);
+
+                if (core_status & V3D_CTL_0_INT_STS_INT_GMPV_SET) {
+                        fprintf(stderr, "GMP violation at 0x%08x\n",
+                                V3D_READ(V3D_GMP_0_VIO_ADDR));
+                        abort();
+                } else {
+                        fprintf(stderr,
+                                "Unexpected ISR with core status 0x%08x\n",
+                                core_status);
+                }
+                abort();
+        }
+
+        return;
+}
+
+static void
+v3dX(simulator_init_regs)(void)
+{
+#if V3D_VERSION == 33
+        /* Set OVRTMUOUT to match kernel behavior.
+         *
+         * This means that the texture sampler uniform configuration's tmu
+         * output type field is used, instead of using the hardware default
+         * behavior based on the texture type.  If you want the default
+         * behavior, you can still put "2" in the indirect texture state's
+         * output_type field.
+         */
+        V3D_WRITE(V3D_CTL_0_MISCCFG, V3D_CTL_1_MISCCFG_OVRTMUOUT_SET);
+#endif
+
+        uint32_t core_interrupts = V3D_CTL_0_INT_STS_INT_GMPV_SET;
+        V3D_WRITE(V3D_CTL_0_INT_MSK_SET, ~core_interrupts);
+        V3D_WRITE(V3D_CTL_0_INT_MSK_CLR, core_interrupts);
+
+        v3d_hw_set_isr(v3d.hw, v3d_isr);
+}
+
+static void
+v3d_bo_free(struct shim_bo *shim_bo)
+{
+        struct v3d_bo *bo = v3d_bo(shim_bo);
+
+        if (bo->gem_vaddr)
+                munmap(bo->gem_vaddr, shim_bo->size);
+
+        util_vma_heap_free(&v3d.heap, bo->offset, bo->base.size);
+}
+
+void
+v3dX(drm_shim_driver_init)(void)
+{
+        shim_device.driver_ioctls = driver_ioctls;
+        shim_device.driver_ioctl_count = ARRAY_SIZE(driver_ioctls);
+
+        shim_device.driver_bo_free = v3d_bo_free;
+
+        /* Allocate a gig of memory to play in. */
+        v3d_hw_alloc_mem(v3d.hw, 1024 * 1024 * 1024);
+        v3d.mem_base =
+                v3d_hw_get_mem(v3d.hw, &v3d.mem_size,
+                               &v3d.mem);
+        util_vma_heap_init(&v3d.heap, 4096, v3d.mem_size - 4096);
+
+        v3dX(simulator_init_regs)();
+}
diff --git a/src/broadcom/meson.build b/src/broadcom/meson.build
index b744e7ed81b..57f0d889b25 100644
--- a/src/broadcom/meson.build
+++ b/src/broadcom/meson.build
@@ -30,6 +30,10 @@ if with_gallium_v3d
   subdir('qpu')
 endif
 
+if with_tools.contains('drm-shim')
+  subdir('drm-shim')
+endif
+
 per_version_libs = []
 foreach ver : v3d_versions
   per_version_libs += static_library(