diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Makefile.sources | 2 | ||||
| -rw-r--r-- | lib/i915/gem_scheduler.c | 125 | ||||
| -rw-r--r-- | lib/i915/gem_scheduler.h | 37 | ||||
| -rw-r--r-- | lib/ioctl_wrappers.h | 2 | ||||
| -rw-r--r-- | lib/meson.build | 10 |
5 files changed, 169 insertions, 7 deletions
diff --git a/lib/Makefile.sources b/lib/Makefile.sources index 965e230e..c33723f9 100644 --- a/lib/Makefile.sources +++ b/lib/Makefile.sources @@ -3,6 +3,8 @@ lib_source_list = \ drmtest.c \ drmtest.h \ i830_reg.h \ + i915/gem_scheduler.c \ + i915/gem_scheduler.h \ i915_3d.h \ i915_reg.h \ i915_pciids.h \ diff --git a/lib/i915/gem_scheduler.c b/lib/i915/gem_scheduler.c new file mode 100644 index 00000000..ad156306 --- /dev/null +++ b/lib/i915/gem_scheduler.c @@ -0,0 +1,125 @@ +/* + * Copyright © 2017 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 (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 <errno.h> +#include <string.h> +#include <sys/ioctl.h> + +#include "igt_core.h" +#include "ioctl_wrappers.h" + +#include "i915/gem_scheduler.h" + +#define LOCAL_I915_PARAM_HAS_SCHEDULER 41 + +/** + * SECTION:gem_scheduler + * @short_description: Helpers for querying scheduler capabilities + * @title: GEM Scheduler + * + * This helper library contains functions used for getting information on + * currently used scheduling model. + */ + +/** + * gem_scheduler_capability: + * @fd: open i915 drm file descriptor + * + * Returns: Scheduler capability bitmap. + */ +unsigned gem_scheduler_capability(int fd) +{ + static int caps = -1; + + if (caps < 0) { + struct drm_i915_getparam gp; + + memset(&gp, 0, sizeof(gp)); + gp.param = LOCAL_I915_PARAM_HAS_SCHEDULER; + gp.value = ∩︀ + + caps = 0; + ioctl(fd, DRM_IOCTL_I915_GETPARAM, &gp, sizeof(gp)); + errno = 0; + } + + return caps; +} + +/** + * gem_has_scheduler: + * @fd: open i915 drm file descriptor + * + * Feature test macro to query whether the driver has scheduling capability. + */ +bool gem_scheduler_enabled(int fd) +{ + return gem_scheduler_capability(fd) & + LOCAL_I915_SCHEDULER_CAP_ENABLED; +} + +/** + * gem_has_ctx_priority: + * @fd: open i915 drm file descriptor + * + * Feature test macro to query whether the driver supports assigning custom + * priorities to contexts from userspace. + */ +bool gem_scheduler_has_ctx_priority(int fd) +{ + return gem_scheduler_capability(fd) & + LOCAL_I915_SCHEDULER_CAP_PRIORITY; +} + +/** + * gem_has_preemption: + * @fd: open i915 drm file descriptor + * + * Feature test macro to query whether the driver supports preempting active + * (currently executing on HW) workloads. + */ +bool gem_scheduler_has_preemption(int fd) +{ + return gem_scheduler_capability(fd) & + LOCAL_I915_SCHEDULER_CAP_PREEMPTION; +} + +/** + * gem_scheduler_print_capability: + * @fd: open i915 drm file descriptor + * + * Helper for pretty-printing scheduler capability. + */ +void gem_scheduler_print_capability(int fd) +{ + unsigned caps = gem_scheduler_capability(fd); + + if (!caps) + return; + + igt_info("Has kernel scheduler\n"); + if (caps & LOCAL_I915_SCHEDULER_CAP_PRIORITY) + igt_info(" - With priority sorting\n"); + if (caps & LOCAL_I915_SCHEDULER_CAP_PREEMPTION) + igt_info(" - With preemption enabled\n"); +} diff --git a/lib/i915/gem_scheduler.h b/lib/i915/gem_scheduler.h new file mode 100644 index 00000000..9fcb0266 --- /dev/null +++ b/lib/i915/gem_scheduler.h @@ -0,0 +1,37 @@ +/* + * Copyright © 2017 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 (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 GEM_SCHEDULER_H +#define GEM_SCHEDULER_H + +#define LOCAL_I915_SCHEDULER_CAP_ENABLED (1 << 0) +#define LOCAL_I915_SCHEDULER_CAP_PRIORITY (1 << 1) +#define LOCAL_I915_SCHEDULER_CAP_PREEMPTION (1 << 2) + +unsigned gem_scheduler_capability(int fd); +bool gem_scheduler_enabled(int fd); +bool gem_scheduler_has_ctx_priority(int fd); +bool gem_scheduler_has_preemption(int fd); +void gem_scheduler_print_capability(int fd); + +#endif /* GEM_SCHEDULER_H */ diff --git a/lib/ioctl_wrappers.h b/lib/ioctl_wrappers.h index 1663b7f8..76a4e80d 100644 --- a/lib/ioctl_wrappers.h +++ b/lib/ioctl_wrappers.h @@ -36,6 +36,8 @@ #include <intel_bufmgr.h> #include <i915_drm.h> +#include "i915/gem_scheduler.h" + /** * igt_ioctl: * @fd: file descriptor diff --git a/lib/meson.build b/lib/meson.build index 89ed2723..22811743 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -2,6 +2,7 @@ lib_headers = [ 'debug.h', 'drmtest.h', 'i830_reg.h', + 'i915/gem_scheduler.h', 'i915_3d.h', 'i915_reg.h', 'i915_pciids.h', @@ -48,6 +49,7 @@ lib_headers = [ lib_sources = [ 'drmtest.c', + 'i915/gem_scheduler.c', 'igt_debugfs.c', 'igt_aux.c', 'igt_gt.c', @@ -152,13 +154,7 @@ lib_version = vcs_tag(input : 'version.h.in', output : 'version.h', lib_intermediates = [] foreach f: lib_sources - # No / in the target name - if f.contains('uwildmat') - name = 'uwildmat' - else - name = f - endif - + name = f.underscorify(f) lib = static_library('igt-' + name, [ f, lib_version ], include_directories: inc, |