diff options
author | Michał Winiarski <michal.winiarski@intel.com> | 2016-01-25 19:35:02 +0100 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-01-25 19:44:34 +0100 |
commit | e6ca4bd7cd911c2a422fd6961970fc5df2b071a0 (patch) | |
tree | e2f7d11a8bd2cefaf9041be1aaf2d1a80f81cf7f | |
parent | 52b5d5016edfac14ca99c01fc7c2800eccbe11c0 (diff) |
lib/ioctl_wrappers: Add gem_has_softpin
We can move it from softpin test into lib, and since softpin support is
highly unlikely to go away in-between getparam ioctl calls, let's just
do a single call and store the value.
v2: rebase
Signed-off-by: Michał Winiarski <michal.winiarski@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r-- | lib/ioctl_wrappers.c | 29 | ||||
-rw-r--r-- | lib/ioctl_wrappers.h | 1 | ||||
-rw-r--r-- | tests/gem_softpin.c | 22 |
3 files changed, 31 insertions, 21 deletions
diff --git a/lib/ioctl_wrappers.c b/lib/ioctl_wrappers.c index b534b037..34351c95 100644 --- a/lib/ioctl_wrappers.c +++ b/lib/ioctl_wrappers.c @@ -1242,6 +1242,35 @@ uint64_t gem_mappable_aperture_size(void) return pci_dev->regions[bar].size; } +#define LOCAL_I915_PARAM_HAS_EXEC_SOFTPIN 37 +/** + * gem_has_softpin: + * @fd: open i915 drm file descriptor + * + * Feature test macro to query whether the softpinning functionality is + * supported. + * + * Returns: Whether softpin support is available + */ +bool gem_has_softpin(int fd) +{ + static int has_softpin = -1; + + if (has_softpin < 0) { + struct drm_i915_getparam gp; + + memset(&gp, 0, sizeof(gp)); + gp.param = LOCAL_I915_PARAM_HAS_EXEC_SOFTPIN; + gp.value = &has_softpin; + + has_softpin = 0; + ioctl(fd, DRM_IOCTL_I915_GETPARAM, &gp, sizeof(gp)); + errno = 0; + } + + return has_softpin; +} + /** * gem_require_caching: * @fd: open i915 drm file descriptor diff --git a/lib/ioctl_wrappers.h b/lib/ioctl_wrappers.h index a6bf7004..04ac9bb7 100644 --- a/lib/ioctl_wrappers.h +++ b/lib/ioctl_wrappers.h @@ -132,6 +132,7 @@ int gem_available_fences(int fd); uint64_t gem_available_aperture_size(int fd); uint64_t gem_aperture_size(int fd); uint64_t gem_mappable_aperture_size(void); +bool gem_has_softpin(int fd); /* check functions which auto-skip tests by calling igt_skip() */ void gem_require_caching(int fd); diff --git a/tests/gem_softpin.c b/tests/gem_softpin.c index c2bf37ce..bfd02b06 100644 --- a/tests/gem_softpin.c +++ b/tests/gem_softpin.c @@ -31,26 +31,6 @@ #define EXEC_OBJECT_PINNED (1<<4) #define EXEC_OBJECT_SUPPORTS_48B_ADDRESS (1<<3) -/* has_softpin_support - * Finds if softpin feature is supported - * @fd DRM fd -*/ -static bool has_softpin_support(int fd) -{ - struct drm_i915_getparam gp; - int val = 0; - - memset(&gp, 0, sizeof(gp)); - gp.param = 37; /* I915_PARAM_HAS_EXEC_SOFTPIN */ - gp.value = &val; - - if (drmIoctl(fd, DRM_IOCTL_I915_GETPARAM, &gp)) - return 0; - - errno = 0; - return (val == 1); -} - /* gen8_canonical_addr * Used to convert any address into canonical form, i.e. [63:48] == [47]. * Based on kernel's sign_extend64 implementation. @@ -494,7 +474,7 @@ igt_main igt_fixture { fd = drm_open_driver_master(DRIVER_INTEL); - igt_require(has_softpin_support(fd)); + igt_require(gem_has_softpin(fd)); } igt_subtest("invalid") |