[igt-dev] [PATCH i-g-t v4 01/11] lib/igt_dummyload: add igt_cork

* [igt-dev] [PATCH i-g-t v4 01/11] lib/igt_dummyload: add igt_cork
@ 2018-02-21 23:19 Antonio Argenziano
  2018-02-21 23:19 ` [igt-dev] [PATCH i-g-t v4 02/11] lib/igt_gt: add intel_measure_ring_size Antonio Argenziano
                   ` (19 more replies)
  0 siblings, 20 replies; 31+ messages in thread
From: Antonio Argenziano @ 2018-02-21 23:19 UTC (permalink / raw)
  To: igt-dev

From: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>

The "cork" bo (imported bo with attached fence) and fence is used in several
tests to stall execution. Moving it to a common place makes the codebase
cleaner.

Note that the actual test updates is done in follow up patches as it is
simpler to do in one go after one more common function is added in the
next patch.

v2: don't use new/free naming, don't use dynamic alloc (Chris)
v3: add sw_sync common functions. (Chris)
v4: squash sw_sync and vgem cork structs into one. (Chris)

Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Signed-off-by: Antonio Argenziano <antonio.argenziano@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
---
 lib/igt_dummyload.c | 121 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 lib/igt_dummyload.h |  32 ++++++++++++++
 2 files changed, 153 insertions(+)

diff --git a/lib/igt_dummyload.c b/lib/igt_dummyload.c
index 27eb402b..e90eff5f 100644
--- a/lib/igt_dummyload.c
+++ b/lib/igt_dummyload.c
@@ -29,12 +29,14 @@
 #include <i915_drm.h>
 
 #include "igt_core.h"
+#include "drmtest.h"
 #include "igt_dummyload.h"
 #include "igt_gt.h"
 #include "intel_chipset.h"
 #include "intel_reg.h"
 #include "ioctl_wrappers.h"
 #include "sw_sync.h"
+#include "igt_vgem.h"
 
 /**
  * SECTION:igt_dummyload
@@ -371,3 +373,122 @@ void igt_terminate_spin_batches(void)
 		igt_spin_batch_end(iter);
 	pthread_mutex_unlock(&list_lock);
 }
+
+static uint32_t plug_vgem_handle(struct igt_cork *cork, int fd)
+{
+	struct vgem_bo bo;
+	int dmabuf;
+	uint32_t handle;
+	struct igt_cork_vgem *vgem_cork = &cork->cork.vgem;
+
+	vgem_cork->device = drm_open_driver(DRIVER_VGEM);
+	igt_require(vgem_has_fences(vgem_cork->device));
+
+	bo.width = bo.height = 1;
+	bo.bpp = 4;
+	vgem_create(vgem_cork->device, &bo);
+	vgem_cork->fence = vgem_fence_attach(vgem_cork->device, &bo, VGEM_FENCE_WRITE);
+
+	dmabuf = prime_handle_to_fd(vgem_cork->device, bo.handle);
+	handle = prime_fd_to_handle(fd, dmabuf);
+	close(dmabuf);
+
+	return handle;
+}
+
+static void unplug_vgem_handle(struct igt_cork *cork)
+{
+	struct igt_cork_vgem *vgem_cork = &cork->cork.vgem;
+
+	igt_assert(vgem_cork->device);
+
+	vgem_fence_signal(vgem_cork->device, vgem_cork->fence);
+	close(vgem_cork->device);
+	vgem_cork->device = -1;
+}
+
+static uint32_t plug_sync_fd(struct igt_cork *cork)
+{
+	int fence;
+	struct igt_cork_sw_sync *sw_sync_cork = &cork->cork.sw_sync;
+
+	igt_require_sw_sync();
+
+	sw_sync_cork->timeline = sw_sync_timeline_create();
+	fence = sw_sync_timeline_create_fence(sw_sync_cork->timeline, 1);
+
+	return fence;
+}
+
+static void unplug_sync_fd(struct igt_cork *cork)
+{
+	struct igt_cork_sw_sync *sw_sync_cork = &cork->cork.sw_sync;
+
+	sw_sync_timeline_inc(sw_sync_cork->timeline, 1);
+	close(sw_sync_cork->timeline);
+}
+
+/**
+ * igt_cork_plug:
+ * @fd: open drm file descriptor
+ * @method: method to utilize for corking.
+ * @cork: structure that will be filled with the state of the cork bo.
+ * Note: this has to match the corking method.
+ *
+ * This function provides a mechanism to stall submission. It provides two
+ * blocking methods:
+ *
+ * VGEM_BO.
+ * Imports a vgem bo with a fence attached to it. This bo can be used as a
+ * dependency during submission to stall execution until the fence is signaled.
+ *
+ * SW_SYNC:
+ * Creates a timeline and then a fence on that timeline. The fence can be used
+ * as an input fence to a request, the request will be stalled until the fence
+ * is signaled.
+ *
+ * The parameters required to unblock the execution and to cleanup are stored in
+ * the provided cork structure.
+ *
+ * Returns:
+ * Handle of the imported BO / Sw sync fence FD.
+ */
+uint32_t igt_cork_plug(struct igt_cork *cork, int fd)
+{
+	igt_assert(cork->cork.fd == -1);
+
+	switch (cork->type) {
+	case CORK_SYNC_FD:
+		return plug_sync_fd(cork);
+
+	case CORK_VGEM_HANDLE:
+		return plug_vgem_handle(cork, fd);
+
+	default:
+		igt_assert_f(0, "Invalid cork type!\n");
+		return 0;
+	}
+}
+
+/**
+ * igt_cork_unplug:
+ * @method: method to utilize for corking.
+ * @cork: cork state from igt_cork_plug()
+ *
+ * This function unblocks the execution by signaling the fence attached to the
+ * imported bo and does the necessary post-processing.
+ *
+ * NOTE: the handle returned by igt_cork_plug is not closed during this phase.
+ */
+void igt_cork_unplug(struct igt_cork *cork)
+{
+	switch (cork->type) {
+	case CORK_SYNC_FD:
+		unplug_sync_fd(cork);
+		return;
+
+	case CORK_VGEM_HANDLE:
+		unplug_vgem_handle(cork);
+		return;
+	}
+}
diff --git a/lib/igt_dummyload.h b/lib/igt_dummyload.h
index ffa7e351..c70d0093 100644
--- a/lib/igt_dummyload.h
+++ b/lib/igt_dummyload.h
@@ -61,4 +61,36 @@ void igt_spin_batch_free(int fd, igt_spin_t *spin);
 
 void igt_terminate_spin_batches(void);
 
+enum igt_cork_type {
+	CORK_SYNC_FD = 1,
+	CORK_VGEM_HANDLE
+};
+
+struct igt_cork_vgem {
+	int device;
+	uint32_t fence;
+};
+
+struct igt_cork_sw_sync {
+	int timeline;
+};
+
+struct igt_cork {
+	enum igt_cork_type type;
+
+	union __cork {
+		int fd;
+
+		struct igt_cork_vgem vgem;
+		struct igt_cork_sw_sync sw_sync;
+	} cork;
+};
+
+#define IGT_CORK(name, cork_type) struct igt_cork name = { .type = cork_type, .cork.fd = -1}
+#define IGT_CORK_HANDLE(name) IGT_CORK(name, CORK_VGEM_HANDLE)
+#define IGT_CORK_FENCE(name) IGT_CORK(name, CORK_SYNC_FD)
+
+uint32_t igt_cork_plug(struct igt_cork *cork, int fd);
+void igt_cork_unplug(struct igt_cork *cork);
+
 #endif /* __IGT_DUMMYLOAD_H__ */
-- 
2.14.2

_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

^ permalink raw reply related	[flat|nested] 31+ messages in thread