diff mbox

[i-g-t,2/2] lib/ioctl_wrappers: Add gem_has_softpin

Message ID 1453312106-6407-2-git-send-email-michal.winiarski@intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Michał Winiarski Jan. 20, 2016, 5:48 p.m. UTC 
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.

Signed-off-by: Micha? Winiarski <michal.winiarski@intel.com>
---
 lib/ioctl_wrappers.c | 29 +++++++++++++++++++++++++++++
 lib/ioctl_wrappers.h |  1 +
 tests/gem_softpin.c  | 22 +---------------------
 3 files changed, 31 insertions(+), 21 deletions(-)

Comments

Chris Wilson Jan. 20, 2016, 9:21 p.m. UTC | #1 
On Wed, Jan 20, 2016 at 06:48:26PM +0100, Micha? Winiarski wrote:
> 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.
> 
> Signed-off-by: Micha? Winiarski <michal.winiarski@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
-Chris
diff mbox

Patch

diff --git a/lib/ioctl_wrappers.c b/lib/ioctl_wrappers.c
index 6099657..e641526 100644
--- a/lib/ioctl_wrappers.c
+++ b/lib/ioctl_wrappers.c
@@ -1256,6 +1256,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 2a282de..9003b6d 100644
--- a/lib/ioctl_wrappers.h
+++ b/lib/ioctl_wrappers.h
@@ -133,6 +133,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 f188559..9889c26 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.
@@ -427,7 +407,7 @@  igt_main
 
 	igt_fixture {
 		fd = drm_open_driver(DRIVER_INTEL);
-		igt_require(has_softpin_support(fd));
+		igt_require(gem_has_softpin(fd));
 	}
 
 	igt_subtest("invalid")