From: Eric Anholt Date: Mon, 13 May 2019 21:03:07 +0000 (-0700) Subject: freedreno: Add support for drm-shim. X-Git-Url: https://git.libre-soc.org/?p=mesa.git;a=commitdiff_plain;h=494ecef6b42198ab6c3eaa8b3e5222643e1e44ff freedreno: Add support for drm-shim. I'm using this for shader-db analysis on x86_64 systems. Reviewed-by: Rob Clark --- diff --git a/src/drm-shim/device.c b/src/drm-shim/device.c index fe1cbbba351..8020c2ae5cc 100644 --- a/src/drm-shim/device.c +++ b/src/drm-shim/device.c @@ -130,6 +130,10 @@ drm_shim_ioctl_version(int fd, unsigned long request, void *arg) const char *date = "20190320"; const char *desc = "shim"; + args->version_major = shim_device.version_major; + args->version_minor = shim_device.version_minor; + args->version_patchlevel = shim_device.version_patchlevel; + if (args->name) strncpy(args->name, shim_device.driver_name, args->name_len); if (args->date) diff --git a/src/drm-shim/drm_shim.h b/src/drm-shim/drm_shim.h index b14353a7962..2cd053f6d65 100644 --- a/src/drm-shim/drm_shim.h +++ b/src/drm-shim/drm_shim.h @@ -43,6 +43,7 @@ struct shim_device { /* Returned by drmGetVersion(). */ const char *driver_name; + int version_major, version_minor, version_patchlevel; }; extern struct shim_device shim_device; diff --git a/src/freedreno/drm-shim/README.md b/src/freedreno/drm-shim/README.md new file mode 100644 index 00000000000..fd4afa1f896 --- /dev/null +++ b/src/freedreno/drm-shim/README.md @@ -0,0 +1,7 @@ +### freedreno_noop backend + +This implements the minimum of msm in order to make shader-db work. +The submit ioctl is stubbed out to not execute anything. + +Export `MESA_LOADER_DRIVER_OVERRIDE=msm +LD_PRELOAD=$prefix/lib/libfreedreno_noop_drm_shim.so`. diff --git a/src/freedreno/drm-shim/freedreno_noop.c b/src/freedreno/drm-shim/freedreno_noop.c new file mode 100644 index 00000000000..66bb53dc5d3 --- /dev/null +++ b/src/freedreno/drm-shim/freedreno_noop.c @@ -0,0 +1,184 @@ +/* + * Copyright © 2019 Google LLC + * + * 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 +#include +#include +#include +#include "drm-uapi/msm_drm.h" +#include "drm-shim/drm_shim.h" + +struct msm_bo { + struct shim_bo base; + uint32_t offset; +}; + +static struct msm_bo * +msm_bo(struct shim_bo *bo) +{ + return (struct msm_bo *)bo; +} + +struct msm_device { + uint32_t next_offset; +}; + +static struct msm_device msm = { + .next_offset = 0x1000, +}; + +static int +msm_ioctl_noop(int fd, unsigned long request, void *arg) +{ + return 0; +} + +static int +msm_ioctl_gem_new(int fd, unsigned long request, void *arg) +{ + struct shim_fd *shim_fd = drm_shim_fd_lookup(fd); + struct drm_msm_gem_new *create = arg; + struct msm_bo *bo = calloc(1, sizeof(*bo)); + + drm_shim_bo_init(&bo->base, create->size); + + assert(UINT_MAX - msm.next_offset > create->size); + + bo->offset = msm.next_offset; + msm.next_offset += create->size; + + create->handle = drm_shim_bo_get_handle(shim_fd, &bo->base); + + drm_shim_bo_put(&bo->base); + + return 0; +} + +static int +msm_ioctl_gem_info(int fd, unsigned long request, void *arg) +{ + struct shim_fd *shim_fd = drm_shim_fd_lookup(fd); + struct drm_msm_gem_info *args = arg; + struct shim_bo *bo = drm_shim_bo_lookup(shim_fd, args->handle); + + switch (args->info) { + case MSM_INFO_GET_OFFSET: + args->value = drm_shim_bo_get_mmap_offset(shim_fd, bo); + return 0; + case MSM_INFO_GET_IOVA: + args->value = msm_bo(bo)->offset; + return 0; + case MSM_INFO_SET_NAME: + return 0; + default: + fprintf(stderr, "Unknown DRM_IOCTL_MSM_GEM_INFO %d\n", args->info); + return -1; + } + + drm_shim_bo_put(bo); + + return 0; +} + +static int +msm_ioctl_get_param(int fd, unsigned long request, void *arg) +{ + struct drm_msm_param *gp = arg; + + switch (gp->param) { + case MSM_PARAM_GPU_ID: + gp->value = 630; + return 0; + case MSM_PARAM_GMEM_SIZE: + gp->value = 1024 * 1024; + return 0; + case MSM_PARAM_GMEM_BASE: + gp->value = 0x100000; + return 0; + case MSM_PARAM_CHIP_ID: + gp->value = (6 << 24) | (3 << 16) | (0 << 8) | (0xff << 0); + return 0; + case MSM_PARAM_NR_RINGS: + gp->value = 1; + return 0; + case MSM_PARAM_MAX_FREQ: + gp->value = 1000000; + return 0; + case MSM_PARAM_TIMESTAMP: + gp->value = 0; + return 0; + case MSM_PARAM_PP_PGTABLE: + gp->value = 1; + return 0; + case MSM_PARAM_FAULTS: + gp->value = 0; + return 0; + default: + fprintf(stderr, "Unknown DRM_IOCTL_MSM_GET_PARAM %d\n", + gp->param); + return -1; + } +} + +static int +msm_ioctl_gem_madvise(int fd, unsigned long request, void *arg) +{ + struct drm_msm_gem_madvise *args = arg; + + args->retained = true; + + return 0; +} + +static ioctl_fn_t driver_ioctls[] = { + [DRM_MSM_GET_PARAM] = msm_ioctl_get_param, + [DRM_MSM_GEM_NEW] = msm_ioctl_gem_new, + [DRM_MSM_GEM_INFO] = msm_ioctl_gem_info, + [DRM_MSM_GEM_CPU_PREP] = msm_ioctl_noop, + [DRM_MSM_GEM_CPU_FINI] = msm_ioctl_noop, + [DRM_MSM_GEM_SUBMIT] = msm_ioctl_noop, + [DRM_MSM_WAIT_FENCE] = msm_ioctl_noop, + [DRM_MSM_GEM_MADVISE] = msm_ioctl_gem_madvise, + [DRM_MSM_SUBMITQUEUE_NEW] = msm_ioctl_noop, + [DRM_MSM_SUBMITQUEUE_CLOSE] = msm_ioctl_noop, + [DRM_MSM_SUBMITQUEUE_QUERY] = msm_ioctl_noop, +}; + +void +drm_shim_driver_init(void) +{ + shim_device.driver_name = "msm"; + shim_device.driver_ioctls = driver_ioctls; + shim_device.driver_ioctl_count = ARRAY_SIZE(driver_ioctls); + + /* msm uses the DRM version to expose features, instead of getparam. */ + shim_device.version_major = 1; + shim_device.version_minor = 5; + shim_device.version_patchlevel = 0; + + drm_shim_override_file("OF_FULLNAME=/rdb/msm\n" + "OF_COMPATIBLE_N=1\n" + "OF_COMPATIBLE_0=qcom,adreno\n", + "/sys/dev/char/%d:%d/device/uevent", + DRM_MAJOR, render_node_minor); +} diff --git a/src/freedreno/drm-shim/meson.build b/src/freedreno/drm-shim/meson.build new file mode 100644 index 00000000000..ac05b4262ce --- /dev/null +++ b/src/freedreno/drm-shim/meson.build @@ -0,0 +1,29 @@ +# Copyright © 2019 Google LLC +# +# 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. + +libfreedreno_noop_drm_shim = shared_library( + ['freedreno_noop_drm_shim'], + 'freedreno_noop.c', + include_directories: inc_common, + dependencies: dep_drm_shim, + c_args : c_vis_args, + install : true, +) diff --git a/src/freedreno/meson.build b/src/freedreno/meson.build index 028ca9f1066..fda973cc684 100644 --- a/src/freedreno/meson.build +++ b/src/freedreno/meson.build @@ -24,6 +24,10 @@ subdir('drm') subdir('ir3') subdir('registers') +if with_tools.contains('drm-shim') + subdir('drm-shim') +endif + if with_freedreno_vk subdir('vulkan') endif