Skip to contentSkip to conversation

lib/i915: Move gem_reopen_driver() out to lib

PATCH In review Anna Karas 4 participants 6 messages Apr 27, 2023 – May 9, 2023 Library code

lore
Share & tools
lore

Anna Karas

author
#0 lore raw

PATCH 1/1 lib/i915: Move gem_reopen_driver() out to lib

We need an equivalent of gem_reopen_driver() in XE. In order to not duplicate the code, move gem_reopen_driver() one directory up from lib/i915 to lib as drm_reopen_driver() so XE can use it too.

Rename gem_reopen_driver() across files.

---
 lib/drmtest.c                    | 18 ++++++++++++++++++
 lib/drmtest.h                    |  2 ++
 lib/i915/gem.c                   | 20 +-------------------
 lib/i915/gem.h                   |  2 --
 lib/i915/gem_ring.c              |  2 +-
 lib/i915/gem_submission.c        |  4 ++--
 tests/i915/api_intel_allocator.c |  6 +++---
 tests/i915/drm_fdinfo.c          |  2 +-
 tests/i915/gem_barrier_race.c    |  2 +-
 tests/i915/gem_close_race.c      |  4 ++--
 tests/i915/gem_concurrent_all.c  |  2 +-
 tests/i915/gem_ctx_create.c      |  2 +-
 tests/i915/gem_ctx_exec.c        |  2 +-
 tests/i915/gem_ctx_param.c       |  3 +--
 tests/i915/gem_ctx_persistence.c | 12 ++++++------
 tests/i915/gem_ctx_shared.c      |  2 +-
 tests/i915/gem_eio.c             |  2 +-
 tests/i915/gem_exec_alignment.c  |  6 +++---
 tests/i915/gem_exec_capture.c    |  2 +-
 tests/i915/gem_exec_fair.c       |  2 +-
 tests/i915/gem_exec_fence.c      |  2 +-
 tests/i915/gem_exec_nop.c        |  2 +-
 tests/i915/gem_exec_parallel.c   |  2 +-
 tests/i915/gem_exec_whisper.c    |  4 ++--
 tests/i915/gem_lmem_evict.c      |  2 +-
 tests/i915/gem_lmem_swapping.c   |  6 +++---
 tests/i915/gem_mmap_gtt.c        |  7 +++----
 tests/i915/gem_mmap_offset.c     |  9 ++++-----
 tests/i915/gem_reset_stats.c     | 30 +++++++++++++++---------------
 tests/i915/gem_ringfill.c        |  2 +-
 tests/i915/gem_softpin.c         |  2 +-
 tests/i915/gem_userptr_blits.c   |  2 +-
 tests/i915/gem_vm_create.c       |  2 +-
 tests/i915/gem_watchdog.c        |  2 +-
 tests/i915/gem_workarounds.c     |  2 +-
 tests/i915/i915_suspend.c        |  2 +-
 tests/i915/perf.c                |  2 +-
 37 files changed, 87 insertions(+), 90 deletions(-)
lib/drmtest.c +18 -0
index c91a9142..72eae7af 100644
@@ -652,6 +652,24 @@ int drm_open_driver_render(int chipset)
 	return fd;
 }
 
+/**
+ * drm_reopen_driver:
+ * @fd: re-open the drm file descriptor
+ *
+ * Re-opens the drm fd which is useful in instances where a clean default
+ * context is needed.
+ */
+int drm_reopen_driver(int fd)
+{
+	char path[256];
+
+	snprintf(path, sizeof(path), "/proc/self/fd/%d", fd);
+	fd = open(path, O_RDWR);
+	igt_assert_fd(fd);
+
+	return fd;
+}
+
 void igt_require_amdgpu(int fd)
 {
 	igt_require(is_amdgpu_device(fd));
lib/drmtest.h +2 -0
index 5878f651..9b7a81b6 100644
@@ -98,6 +98,8 @@ int __drm_open_driver_another(int idx, int chipset);
 int __drm_open_driver(int chipset);
 int __drm_open_driver_render(int chipset);
 
+int drm_reopen_driver(int fd);
+
 void igt_require_amdgpu(int fd);
 void igt_require_intel(int fd);
 void igt_require_i915(int fd);
lib/i915/gem.c +1 -19
index ed45a9ed..6da3e5c9 100644
@@ -147,7 +147,7 @@ void igt_require_gem(int i915)
 	 * of a wedged device, not for actually waiting on outstanding
 	 * requests! So create a new drm_file for the device that is clean.
 	 */
-	i915 = gem_reopen_driver(i915);
+	i915 = drm_reopen_driver(i915);
 
 	/*
 	 * Reset the global seqno at the start of each test. This ensures that
@@ -189,21 +189,3 @@ void gem_quiescent_gpu(int i915)
 	igt_drop_caches_set(i915,
 			    DROP_ACTIVE | DROP_RETIRE | DROP_IDLE | DROP_FREED);
 }
-
-/**
- * gem_reopen_driver:
- * @i915: re-open the i915 drm file descriptor
- *
- * Re-opens the drm fd which is useful in instances where a clean default
- * context is needed.
- */
-int gem_reopen_driver(int i915)
-{
-	char path[256];
-
-	snprintf(path, sizeof(path), "/proc/self/fd/%d", i915);
-	i915 = open(path, O_RDWR);
-	igt_assert_fd(i915);
-
-	return i915;
-}
lib/i915/gem.h +0 -2
index feabac8d..06dcb546 100644
@@ -30,6 +30,4 @@
 void igt_require_gem(int i915);
 void gem_quiescent_gpu(int i915);
 
-int gem_reopen_driver(int i915);
-
 #endif /* I915_GEM_H */
lib/i915/gem_ring.c +1 -1
index 6d28b5d9..eb2c7c2c 100644
@@ -149,7 +149,7 @@ gem_measure_ring_inflight(int fd, unsigned int engine, enum measure_ring_flags f
 {
 	unsigned int min = ~0u;
 
-	fd = gem_reopen_driver(fd);
+	fd = drm_reopen_driver(fd);
 
 	/* When available, disable execbuf throttling */
 	fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | O_NONBLOCK);
lib/i915/gem_submission.c +2 -2
index 0358802e..adf5eb39 100644
@@ -30,7 +30,6 @@
 
 #include <i915_drm.h>
 
-#include "i915/gem.h"
 #include "i915/gem_create.h"
 #include "i915/gem_engine_topology.h"
 #include "i915/gem_submission.h"
@@ -42,6 +41,7 @@
 #include "intel_chipset.h"
 #include "intel_reg.h"
 #include "ioctl_wrappers.h"
+#include "drmtest.h"
 
 /**
  * SECTION:gem_submission
@@ -158,7 +158,7 @@ void gem_test_all_engines(int i915)
 	};
 	const intel_ctx_t *ctx;
 
-	i915 = gem_reopen_driver(i915);
+	i915 = drm_reopen_driver(i915);
 	igt_assert(!is_wedged(i915));
 
 	ctx = intel_ctx_create_all_physical(i915);
tests/i915/api_intel_allocator.c +3 -3
index e9039a21..1263e0fb 100644
@@ -498,7 +498,7 @@ static void reopen(int fd)
 
 	igt_require_gem(fd);
 
-	fd2 = gem_reopen_driver(fd);
+	fd2 = drm_reopen_driver(fd);
 
 	__reopen_allocs(fd, fd2, true);
 
@@ -514,7 +514,7 @@ static void reopen_fork(int fd)
 
 	intel_allocator_multiprocess_start();
 
-	fd2 = gem_reopen_driver(fd);
+	fd2 = drm_reopen_driver(fd);
 
 	igt_fork(child, 2) {
 		igt_until_timeout(REOPEN_TIMEOUT)
@@ -681,7 +681,7 @@ static void fork_reopen_allocator(int fd, uint8_t type)
 		igt_assert(!intel_allocator_is_allocated(ctx_ahnd, 1, 123, offset));
 		intel_allocator_alloc(ctx_ahnd, 2, 123, 0);
 
-		fd = gem_reopen_driver(fd);
+		fd = drm_reopen_driver(fd);
 		fd_ahnd = intel_allocator_open(fd, 0, type);
 		igt_assert(!intel_allocator_is_allocated(fd_ahnd, 1, 123, offset));
 		intel_allocator_alloc(fd_ahnd, 2, 123, 0);
tests/i915/drm_fdinfo.c +1 -1
index 1b124755..ac668c29 100644
@@ -201,7 +201,7 @@ single(int gem_fd, const intel_ctx_t *ctx,
 		igt_require(!gem_using_guc_submission(gem_fd));
 
 	if (flags & TEST_ISOLATION) {
-		spin_fd = gem_reopen_driver(gem_fd);
+		spin_fd = drm_reopen_driver(gem_fd);
 		ctx = intel_ctx_create_all_physical(spin_fd);
 	} else {
 		spin_fd = gem_fd;
tests/i915/gem_barrier_race.c +1 -1
index f446aab6..faeec361 100644
@@ -95,7 +95,7 @@ static void intel_context_first_pin_last_unpin_loop(int fd, uint64_t engine, int
 	 */
 	const uint32_t batch[2] = { 0, MI_BATCH_BUFFER_END };
 
-	fd = gem_reopen_driver(fd);
+	fd = drm_reopen_driver(fd);
 
 	do {
 		uint32_t handle = gem_create(fd, 4096);
tests/i915/gem_close_race.c +2 -2
index 9c646f42..dc88eca4 100644
@@ -170,7 +170,7 @@ static void process(int fd, int child)
 {
 	uint32_t handle;
 
-	fd = gem_reopen_driver(fd);
+	fd = drm_reopen_driver(fd);
 
 	handle = load(fd);
 	if ((child & 63) == 63)
@@ -220,7 +220,7 @@ static void thread(int fd, struct drm_gem_open name,
 
 		memset(history, 0, sizeof(*history) * N_HISTORY);
 
-		crashme.fd = gem_reopen_driver(fd);
+		crashme.fd = drm_reopen_driver(fd);
 
 		memset(&its, 0, sizeof(its));
 		its.it_value.tv_nsec = msec(1) + (rand() % msec(150));
tests/i915/gem_concurrent_all.c +1 -1
index 25b7daf8..fb3b5f5d 100644
@@ -1465,7 +1465,7 @@ static void __run_forked(struct buffers *buffers,
 		int num_buffers;
 
 		/* recreate process local variables */
-		fd = gem_reopen_driver(fd);
+		fd = drm_reopen_driver(fd);
 
 		intel_allocator_init(); /* detach from thread */
 		num_buffers = buffers->num_buffers / num_children;
tests/i915/gem_ctx_create.c +1 -1
index 39f070af..a59abd08 100644
@@ -106,7 +106,7 @@ static void files(int core, const intel_ctx_cfg_t *cfg,
 
 		clock_gettime(CLOCK_MONOTONIC, &start);
 		do {
-			fd = gem_reopen_driver(core);
+			fd = drm_reopen_driver(core);
 
 			ctx = intel_ctx_create(fd, cfg);
 			execbuf.rsvd1 = ctx->id;
tests/i915/gem_ctx_exec.c +1 -1
index 3d94f01d..20fa1159 100644
@@ -282,7 +282,7 @@ static void nohangcheck_hostile(int i915)
 	 * we forcibly terminate that context.
 	 */
 
-	i915 = gem_reopen_driver(i915);
+	i915 = drm_reopen_driver(i915);
 
 	dir = igt_params_open(i915);
 	igt_require(dir != -1);
tests/i915/gem_ctx_param.c +1 -2
index d119ea74..2526b09c 100644
@@ -28,7 +28,6 @@
 #include <limits.h>
 
 #include "igt.h"
-#include "i915/gem.h"
 #include "i915/gem_create.h"
 #include "i915/gem_vm.h"
 
@@ -81,7 +80,7 @@ static void set_priority(int i915)
 	igt_permute_array(values, size, igt_exchange_int64);
 
 	igt_fork(flags, NEW_CTX | USER) {
-		int fd = gem_reopen_driver(i915);
+		int fd = drm_reopen_driver(i915);
 		struct drm_i915_gem_context_param arg = {
 			.param = I915_CONTEXT_PARAM_PRIORITY,
 			.ctx_id = flags & NEW_CTX ? gem_context_create(fd) : 0,
tests/i915/gem_ctx_persistence.c +6 -6
index 9fb52818..c0197cea 100644
@@ -598,7 +598,7 @@ static void test_nonpersistent_file(int i915)
 	 * has been made nonpersistent, in which case it must be terminated.
 	 */
 
-	i915 = gem_reopen_driver(i915);
+	i915 = drm_reopen_driver(i915);
 
 	ahnd = get_reloc_ahnd(i915, 0);
 	gem_context_set_persistence(i915, 0, false);
@@ -742,7 +742,7 @@ static void test_process(int i915)
 		uint64_t ahnd;
 
 		intel_allocator_init();
-		i915 = gem_reopen_driver(i915);
+		i915 = drm_reopen_driver(i915);
 		gem_quiescent_gpu(i915);
 
 		gem_context_set_persistence(i915, 0, false);
@@ -790,7 +790,7 @@ static void test_userptr(int i915)
 		uint64_t ahnd;
 
 		intel_allocator_init();
-		i915 = gem_reopen_driver(i915);
+		i915 = drm_reopen_driver(i915);
 		gem_quiescent_gpu(i915);
 
 		gem_context_set_persistence(i915, 0, false);
@@ -833,7 +833,7 @@ static void test_process_mixed(int pfd, const intel_ctx_cfg_t *cfg,
 	igt_fork(child, 1) {
 		int i915;
 
-		i915 = gem_reopen_driver(pfd);
+		i915 = drm_reopen_driver(pfd);
 		gem_quiescent_gpu(i915);
 
 		for (int persists = 0; persists <= 1; persists++) {
@@ -1000,7 +1000,7 @@ static void test_processes(int i915)
 			uint64_t ahnd;
 
 			intel_allocator_init();
-			i915 = gem_reopen_driver(i915);
+			i915 = drm_reopen_driver(i915);
 			gem_context_set_persistence(i915, 0, i);
 
 			ahnd = get_reloc_ahnd(i915, 0);
@@ -1069,7 +1069,7 @@ static void __smoker(int i915, const intel_ctx_cfg_t *cfg,
 	const intel_ctx_t *ctx;
 	uint64_t ahnd;
 
-	fd = gem_reopen_driver(i915);
+	fd = drm_reopen_driver(i915);
 	ctx = ctx_create_persistence(fd, cfg, expected > 0);
 	ahnd = get_reloc_ahnd(fd, ctx->id);
 	spin = igt_spin_new(fd, .ahnd = ahnd, .ctx = ctx, .engine = engine,
tests/i915/gem_ctx_shared.c +1 -1
index 3d73db58..8629992e 100644
@@ -206,7 +206,7 @@ static void exhaust_shared_gtt(int i915, unsigned int flags)
 		},
 	};
 
-	i915 = gem_reopen_driver(i915);
+	i915 = drm_reopen_driver(i915);
 
 	vm_create_ext.param.value = gem_vm_create(i915);
 
tests/i915/gem_eio.c +1 -1
index 8dbaa7a7..81e55e16 100644
@@ -450,7 +450,7 @@ static void set_heartbeat(int i915, int interval)
 
 static int reopen_device(int i915)
 {
-	i915 = gem_reopen_driver(i915);
+	i915 = drm_reopen_driver(i915);
 	igt_require_gem(i915);
 	set_heartbeat(i915, 250); /* require gem restores defaults */
 
tests/i915/gem_exec_alignment.c +3 -3
index a9fcd2a7..5059572f 100644
@@ -158,7 +158,7 @@ naughty_child(int i915, int link, uint32_t shared, unsigned int flags)
 	uint64_t elapsed;
 
 	if (flags & ISOLATED)
-		i915 = gem_reopen_driver(i915);
+		i915 = drm_reopen_driver(i915);
 
 	if (!(flags & SHARED))
 		shared = 0;
@@ -449,7 +449,7 @@ static void forked(int i915, int timeout)
 	struct drm_i915_gem_exec_object2 *obj;
 	unsigned long count;
 
-	i915 = gem_reopen_driver(i915);
+	i915 = drm_reopen_driver(i915);
 	igt_require(gem_uses_full_ppgtt(i915));
 
 	obj = setup_many(i915, &count);
@@ -457,7 +457,7 @@ static void forked(int i915, int timeout)
 		obj[i].handle = gem_flink(i915, obj[i].handle);
 
 	igt_fork(child, sysconf(_SC_NPROCESSORS_ONLN)) {
-		i915 = gem_reopen_driver(i915);
+		i915 = drm_reopen_driver(i915);
 		for (unsigned long i = 0; i < count; i++)
 			obj[i].handle = gem_open(i915, obj[i].handle);
 		__many(i915, timeout, obj, count);
tests/i915/gem_exec_capture.c +1 -1
index 9c391192..5d3e0905 100644
@@ -714,7 +714,7 @@ static void prioinv(int fd, int dir, const intel_ctx_t *ctx,
 	igt_fork(child, 1) {
 		const intel_ctx_t *ctx2;
 		int fence_out;
-		fd = gem_reopen_driver(fd);
+		fd = drm_reopen_driver(fd);
 		igt_debug("Submitting large capture [%ld x %dMiB objects]\n",
 			  count, (int)(size >> 20));
 
tests/i915/gem_exec_fair.c +1 -1
index 8208ab40..67af4739 100644
@@ -728,7 +728,7 @@ static void fairness(int i915, const intel_ctx_cfg_t *cfg,
 				if (common)
 					dmabuf = prime_handle_to_fd(i915, common);
 
-				i915 = gem_reopen_driver(i915);
+				i915 = drm_reopen_driver(i915);
 
 				if (dmabuf != -1)
 					common = prime_fd_to_handle(i915, dmabuf);
tests/i915/gem_exec_fence.c +1 -1
index c2d874f8..70f86da5 100644
@@ -1655,7 +1655,7 @@ static void test_invalid_timeline_fence_array(int fd)
 	uint64_t value;
 	void *ptr;
 
-	fd = gem_reopen_driver(fd);
+	fd = drm_reopen_driver(fd);
 
 	/* create an otherwise valid execbuf */
 	memset(&obj, 0, sizeof(obj));
tests/i915/gem_exec_nop.c +1 -1
index 497f57f0..f1ec23e8 100644
@@ -608,7 +608,7 @@ static void multiple(int fd, const intel_ctx_t *ctx,
 		int i915;
 		const intel_ctx_t *child_ctx;
 
-		i915 = gem_reopen_driver(fd);
+		i915 = drm_reopen_driver(fd);
 		child_ctx = intel_ctx_create(i915, &ctx->cfg);
 		execbuf.rsvd1 = child_ctx->id;
 
tests/i915/gem_exec_parallel.c +1 -1
index 705b22cb..97257ea4 100644
@@ -86,7 +86,7 @@ static void *thread(void *data)
 	pthread_mutex_unlock(t->mutex);
 
 	if (t->flags & FDS) {
-		fd = gem_reopen_driver(t->fd);
+		fd = drm_reopen_driver(t->fd);
 	} else {
 		fd = t->fd;
 	}
tests/i915/gem_exec_whisper.c +2 -2
index 29d96cdc..80e4b391 100644
@@ -98,7 +98,7 @@ static void init_hang(struct hang *h, int fd, const intel_ctx_cfg_t *cfg)
 	uint32_t *batch;
 	int i, gen;
 
-	h->fd = gem_reopen_driver(fd);
+	h->fd = drm_reopen_driver(fd);
 	igt_allow_hang(h->fd, 0, 0);
 
 	gen = intel_gen(intel_get_drm_devid(h->fd));
@@ -329,7 +329,7 @@ static void whisper(int fd, const intel_ctx_t *ctx,
 
 		if (flags & FDS) {
 			for (n = 0; n < 64; n++) {
-				fds[n] = gem_reopen_driver(fd);
+				fds[n] = drm_reopen_driver(fd);
 			}
 		}
 		if (flags & (CONTEXTS | QUEUES | FDS)) {
tests/i915/gem_lmem_evict.c +1 -1
index 71a066de..d2611bd5 100644
@@ -57,7 +57,7 @@ static void test_dontneed_evict_race(int fd,
 	igt_fork(child, 1) {
 		uint32_t handle2;
 
-		fd = gem_reopen_driver(fd);
+		fd = drm_reopen_driver(fd);
 
 		handle2 = gem_create_in_memory_region_list(fd,
 							   size, 0,
tests/i915/gem_lmem_swapping.c +3 -3
index 55b044ec..4177286b 100644
@@ -539,7 +539,7 @@ static void test_evict(int i915,
 	fill_params(i915, &params, region, flags, nproc, false);
 
 	if (flags & TEST_PARALLEL) {
-		int fd = gem_reopen_driver(i915);
+		int fd = drm_reopen_driver(i915);
 
 		intel_allocator_multiprocess_start();
 		ctx = intel_ctx_create_all_physical(fd);
@@ -610,7 +610,7 @@ static void test_smem_oom(int i915,
 
 	/* process for testing lmem eviction */
 	igt_fork(child, 1) {
-		int fd = gem_reopen_driver(i915);
+		int fd = drm_reopen_driver(i915);
 		struct params params;
 
 		fill_params(i915, &params, region, 0, 1, true);
@@ -637,7 +637,7 @@ static void test_smem_oom(int i915,
 				}
 			}
 			igt_fork(child, 1) {
-				int fd = gem_reopen_driver(i915);
+				int fd = drm_reopen_driver(i915);
 
 				for (int pass = 0; pass < num_alloc; pass++) {
 					if (READ_ONCE(*lmem_done))
tests/i915/gem_mmap_gtt.c +3 -4
index c14ab50e..0b3a6e5b 100644
@@ -41,7 +41,6 @@
 #include <sys/wait.h>
 #include "drm.h"
 
-#include "i915/gem.h"
 #include "i915/gem_create.h"
 #include "igt.h"
 #include "igt_sysfs.h"
@@ -360,8 +359,8 @@ static void
 test_isolation(int i915)
 {
 	struct drm_i915_gem_mmap_gtt mmap_arg;
-	int A = gem_reopen_driver(i915);
-	int B = gem_reopen_driver(i915);
+	int A = drm_reopen_driver(i915);
+	int B = drm_reopen_driver(i915);
 	uint64_t offset_a, offset_b;
 	uint32_t a, b;
 	void *ptr;
@@ -448,7 +447,7 @@ test_flink_race(int i915)
 	igt_assert(handles != MAP_FAILED);
 
 	igt_fork(child, ncpus + 1) {
-		int fd = gem_reopen_driver(i915);
+		int fd = drm_reopen_driver(i915);
 
 		do {
 			struct drm_i915_gem_mmap_gtt mmap_arg = {};
tests/i915/gem_mmap_offset.c +4 -5
index 962fc1b7..e7659e30 100644
@@ -33,7 +33,6 @@
 #include <unistd.h>
 #include "drm.h"
 
-#include "i915/gem.h"
 #include "i915/gem_create.h"
 #include "i915/intel_memory_region.h"
 #include "igt.h"
@@ -299,8 +298,8 @@ static void isolation(int i915)
 			struct drm_i915_gem_mmap_offset mmap_arg = {
 				.flags = t->type
 			};
-			int A = gem_reopen_driver(i915);
-			int B = gem_reopen_driver(i915);
+			int A = drm_reopen_driver(i915);
+			int B = drm_reopen_driver(i915);
 			uint64_t offset_a, offset_b;
 			uint32_t a, b;
 			void *ptr;
@@ -622,7 +621,7 @@ static void open_flood(int i915, int timeout)
 			continue;
 
 		igt_fork(child, 1) {
-			i915 = gem_reopen_driver(i915);
+			i915 = drm_reopen_driver(i915);
 			arg.handle = prime_fd_to_handle(i915, dmabuf);
 
 			do {
@@ -636,7 +635,7 @@ static void open_flood(int i915, int timeout)
 	igt_until_timeout(timeout) {
 		int tmp;
 
-		tmp = gem_reopen_driver(i915);
+		tmp = drm_reopen_driver(i915);
 		handle = prime_fd_to_handle(i915, dmabuf);
 
 		for_each_mmap_offset_type(i915, t) {
tests/i915/gem_reset_stats.c +15 -15
index 7b003d88..ddc61781 100644
@@ -267,7 +267,7 @@ static void test_rs(const struct intel_execution_ring *e,
 	igt_debug("num fds=%d, hang index=%d\n", num_fds, hang_index);
 
 	for (i = 0; i < num_fds; i++) {
-		fd[i] = gem_reopen_driver(device);
+		fd[i] = drm_reopen_driver(device);
 		assert_reset_status(i, fd[i], 0, RS_NO_ERROR);
 	}
 
@@ -318,7 +318,7 @@ static void test_rs_ctx(const struct intel_execution_ring *e,
 	test_rs(e, num_fds, -1, RS_NO_ERROR);
 
 	for (i = 0; i < num_fds; i++) {
-		fd[i] = gem_reopen_driver(device);
+		fd[i] = drm_reopen_driver(device);
 		igt_assert(fd[i]);
 		assert_reset_status(i, fd[i], 0, RS_NO_ERROR);
 
@@ -384,8 +384,8 @@ static void test_ban(const struct intel_execution_ring *e)
 	int ban, retry = 10;
 	int active_count = 0;
 
-	fd_bad = gem_reopen_driver(device);
-	fd_good = gem_reopen_driver(device);
+	fd_bad = drm_reopen_driver(device);
+	fd_good = drm_reopen_driver(device);
 
 	assert_reset_status(fd_bad, fd_bad, 0, RS_NO_ERROR);
 	assert_reset_status(fd_good, fd_good, 0, RS_NO_ERROR);
@@ -438,7 +438,7 @@ static void test_ban_ctx(const struct intel_execution_ring *e)
 	uint32_t ctx_good, ctx_bad;
 	int active_count = 0;
 
-	fd = gem_reopen_driver(device);
+	fd = drm_reopen_driver(device);
 
 	assert_reset_status(fd, fd, 0, RS_NO_ERROR);
 
@@ -494,8 +494,8 @@ static void test_unrelated_ctx(const struct intel_execution_ring *e)
 	int fd1,fd2;
 	int ctx_guilty, ctx_unrelated;
 
-	fd1 = gem_reopen_driver(device);
-	fd2 = gem_reopen_driver(device);
+	fd1 = drm_reopen_driver(device);
+	fd2 = drm_reopen_driver(device);
 	assert_reset_status(0, fd1, 0, RS_NO_ERROR);
 	assert_reset_status(1, fd2, 0, RS_NO_ERROR);
 	ctx_guilty = gem_context_create(fd1);
@@ -530,7 +530,7 @@ static int get_reset_count(int fd, int ctx)
 
 static void test_close_pending_ctx(const struct intel_execution_ring *e)
 {
-	int fd = gem_reopen_driver(device);
+	int fd = drm_reopen_driver(device);
 	uint32_t ctx = gem_context_create(fd);
 
 	assert_reset_status(fd, fd, ctx, RS_NO_ERROR);
@@ -544,7 +544,7 @@ static void test_close_pending_ctx(const struct intel_execution_ring *e)
 
 static void test_close_pending(const struct intel_execution_ring *e)
 {
-	int fd = gem_reopen_driver(device);
+	int fd = drm_reopen_driver(device);
 
 	assert_reset_status(fd, fd, 0, RS_NO_ERROR);
 
@@ -588,7 +588,7 @@ static void noop_on_each_ring(int fd, const bool reverse)
 static void test_close_pending_fork(const struct intel_execution_ring *e,
 				    const bool reverse)
 {
-	int fd = gem_reopen_driver(device);
+	int fd = drm_reopen_driver(device);
 	igt_hang_t hang;
 	int pid;
 
@@ -603,7 +603,7 @@ static void test_close_pending_fork(const struct intel_execution_ring *e,
 	 */
 	pid = fork();
 	if (pid == 0) {
-		const int fd2 = gem_reopen_driver(device);
+		const int fd2 = drm_reopen_driver(device);
 		igt_assert_lte(0, fd2);
 
 		/* The crucial component is that we schedule the same noop batch
@@ -630,7 +630,7 @@ static void test_close_pending_fork(const struct intel_execution_ring *e,
 static void test_reset_count(const struct intel_execution_ring *e,
 			     const bool create_ctx)
 {
-	int fd = gem_reopen_driver(device);
+	int fd = drm_reopen_driver(device);
 	int ctx;
 	long c1, c2;
 
@@ -733,7 +733,7 @@ static void test_params_ctx(void)
 {
 	int fd;
 
-	fd = gem_reopen_driver(device);
+	fd = drm_reopen_driver(device);
 	_test_param(fd, gem_context_create(fd));
 	close(fd);
 }
@@ -742,7 +742,7 @@ static void test_params(void)
 {
 	int fd;
 
-	fd = gem_reopen_driver(device);
+	fd = drm_reopen_driver(device);
 	_test_param(fd, 0);
 	close(fd);
 }
@@ -767,7 +767,7 @@ static void defer_hangcheck(const struct intel_execution_ring *engine)
 	int fd, count_start, count_end;
 	int seconds = 30;
 
-	fd = gem_reopen_driver(device);
+	fd = drm_reopen_driver(device);
 
 	next = next_engine(fd, engine);
 	igt_skip_on(next == engine);
tests/i915/gem_ringfill.c +1 -1
index afcd7b73..de6e26bf 100644
@@ -219,7 +219,7 @@ static void run_test(int fd, const intel_ctx_t *ctx, unsigned ring,
 		igt_fork(child, nchild) {
 			const intel_ctx_t *child_ctx = NULL;
 			if (flags & NEWFD) {
-				fd = gem_reopen_driver(fd);
+				fd = drm_reopen_driver(fd);
 				child_ctx = intel_ctx_create(fd, &ctx->cfg);
 
 				setup_execbuf(fd, child_ctx, &execbuf, obj, reloc, ring);
tests/i915/gem_softpin.c +1 -1
index 8717860b..933daa4a 100644
@@ -1160,7 +1160,7 @@ static void *thread(void *data)
 	uint32_t batch = MI_BATCH_BUFFER_END;
 	int fd, ret, succeeded = 0;
 
-	fd = gem_reopen_driver(t->fd);
+	fd = drm_reopen_driver(t->fd);
 	ctx = intel_ctx_create(fd, &t->ctx->cfg);
 	offset_obj = gem_detect_safe_start_offset(fd);
 	offset_bb = ALIGN(offset_obj + 4096, gem_detect_safe_alignment(fd));
tests/i915/gem_userptr_blits.c +1 -1
index b00afc32..baba7cf3 100644
@@ -669,7 +669,7 @@ static void test_nohangcheck_hostile(int i915)
 	 * Even if the user disables hangcheck, we must still recover.
 	 */
 
-	i915 = gem_reopen_driver(i915);
+	i915 = drm_reopen_driver(i915);
 	gem_require_contexts(i915);
 
 	dir = igt_params_open(i915);
tests/i915/gem_vm_create.c +1 -1
index f47d8c55..44958cce 100644
@@ -306,7 +306,7 @@ static void isolation(int i915)
 	struct drm_i915_gem_context_param arg = {
 		.param = I915_CONTEXT_PARAM_VM,
 	};
-	int other = gem_reopen_driver(i915);
+	int other = drm_reopen_driver(i915);
 	uint32_t ctx[2], vm[2], result;
 	int loops = 4096;
 
tests/i915/gem_watchdog.c +1 -1
index 27f3a2d7..47ccd2ca 100644
@@ -564,7 +564,7 @@ igt_main
 					timeout * 1000);
 		default_timeout_wait_s = timeout * 5;
 
-		i915 = gem_reopen_driver(i915); /* Apply modparam. */
+		i915 = drm_reopen_driver(i915); /* Apply modparam. */
 		ctx = intel_ctx_create_all_physical(i915);
 	}
 
tests/i915/gem_workarounds.c +1 -1
index 7d119962..ae544adb 100644
@@ -198,7 +198,7 @@ static void check_workarounds(int fd, enum operation op, unsigned int flags)
 	const intel_ctx_t *ctx;
 
 	if (flags & FD)
-		fd = gem_reopen_driver(fd);
+		fd = drm_reopen_driver(fd);
 
 	ctx = intel_ctx_0(fd);
 	if (flags & CONTEXT) {
tests/i915/i915_suspend.c +1 -1
index a9507964..5b289ecb 100644
@@ -178,7 +178,7 @@ test_shrink(int fd, unsigned int mode)
 	gem_quiescent_gpu(fd);
 
 	igt_multi_fork(child, 1) {
-		fd = gem_reopen_driver(fd);
+		fd = drm_reopen_driver(fd);
 		igt_purge_vm_caches(fd);
 
 		mem = igt_get_total_pinnable_mem(&size);
tests/i915/perf.c +1 -1
index 9ca4d34b..cd73b1a9 100644
@@ -4513,7 +4513,7 @@ gen12_test_single_ctx_render_target_writes_a_counter(const struct intel_executio
 	do {
 		igt_fork_helper(&child) {
 			/* A local device for local resources. */
-			drm_fd = gem_reopen_driver(drm_fd);
+			drm_fd = drm_reopen_driver(drm_fd);
 
 			igt_drop_root();
 			gen12_single_ctx_helper(e);
Signature · 1 line
2.25.1
#1 lore raw

I forgot to add someone to the To/CC.
Adding @Zbigniew and @Kamil.

Quoted 864 lines · Anna Karas

We need an equivalent of gem_reopen_driver() in XE. In order to not duplicate the code, move gem_reopen_driver() one directory up from lib/i915 to lib as drm_reopen_driver() so XE can use it too.

Rename gem_reopen_driver() across files.

---
  lib/drmtest.c                    | 18 ++++++++++++++++++
  lib/drmtest.h                    |  2 ++
  lib/i915/gem.c                   | 20 +-------------------
  lib/i915/gem.h                   |  2 --
  lib/i915/gem_ring.c              |  2 +-
  lib/i915/gem_submission.c        |  4 ++--
  tests/i915/api_intel_allocator.c |  6 +++---
  tests/i915/drm_fdinfo.c          |  2 +-
  tests/i915/gem_barrier_race.c    |  2 +-
  tests/i915/gem_close_race.c      |  4 ++--
  tests/i915/gem_concurrent_all.c  |  2 +-
  tests/i915/gem_ctx_create.c      |  2 +-
  tests/i915/gem_ctx_exec.c        |  2 +-
  tests/i915/gem_ctx_param.c       |  3 +--
  tests/i915/gem_ctx_persistence.c | 12 ++++++------
  tests/i915/gem_ctx_shared.c      |  2 +-
  tests/i915/gem_eio.c             |  2 +-
  tests/i915/gem_exec_alignment.c  |  6 +++---
  tests/i915/gem_exec_capture.c    |  2 +-
  tests/i915/gem_exec_fair.c       |  2 +-
  tests/i915/gem_exec_fence.c      |  2 +-
  tests/i915/gem_exec_nop.c        |  2 +-
  tests/i915/gem_exec_parallel.c   |  2 +-
  tests/i915/gem_exec_whisper.c    |  4 ++--
  tests/i915/gem_lmem_evict.c      |  2 +-
  tests/i915/gem_lmem_swapping.c   |  6 +++---
  tests/i915/gem_mmap_gtt.c        |  7 +++----
  tests/i915/gem_mmap_offset.c     |  9 ++++-----
  tests/i915/gem_reset_stats.c     | 30 +++++++++++++++---------------
  tests/i915/gem_ringfill.c        |  2 +-
  tests/i915/gem_softpin.c         |  2 +-
  tests/i915/gem_userptr_blits.c   |  2 +-
  tests/i915/gem_vm_create.c       |  2 +-
  tests/i915/gem_watchdog.c        |  2 +-
  tests/i915/gem_workarounds.c     |  2 +-
  tests/i915/i915_suspend.c        |  2 +-
  tests/i915/perf.c                |  2 +-
  37 files changed, 87 insertions(+), 90 deletions(-)
lib/drmtest.c +18 -0
index c91a9142..72eae7af 100644
@@ -652,6 +652,24 @@ int drm_open_driver_render(int chipset)
  	return fd;
  }
 
+/**
+ * drm_reopen_driver:
+ * @fd: re-open the drm file descriptor
+ *
+ * Re-opens the drm fd which is useful in instances where a clean default
+ * context is needed.
+ */
+int drm_reopen_driver(int fd)
+{
+	char path[256];
+
+	snprintf(path, sizeof(path), "/proc/self/fd/%d", fd);
+	fd = open(path, O_RDWR);
+	igt_assert_fd(fd);
+
+	return fd;
+}
+
  void igt_require_amdgpu(int fd)
  {
  	igt_require(is_amdgpu_device(fd));
lib/drmtest.h +2 -0
index 5878f651..9b7a81b6 100644
@@ -98,6 +98,8 @@ int __drm_open_driver_another(int idx, int chipset);
  int __drm_open_driver(int chipset);
  int __drm_open_driver_render(int chipset);
 
+int drm_reopen_driver(int fd);
+
  void igt_require_amdgpu(int fd);
  void igt_require_intel(int fd);
  void igt_require_i915(int fd);
lib/i915/gem.c +1 -19
index ed45a9ed..6da3e5c9 100644
@@ -147,7 +147,7 @@ void igt_require_gem(int i915)
  	 * of a wedged device, not for actually waiting on outstanding
  	 * requests! So create a new drm_file for the device that is clean.
  	 */
-	i915 = gem_reopen_driver(i915);
+	i915 = drm_reopen_driver(i915);
 
  	/*
  	 * Reset the global seqno at the start of each test. This ensures that
@@ -189,21 +189,3 @@ void gem_quiescent_gpu(int i915)
  	igt_drop_caches_set(i915,
  			    DROP_ACTIVE | DROP_RETIRE | DROP_IDLE | DROP_FREED);
  }
-
-/**
- * gem_reopen_driver:
- * @i915: re-open the i915 drm file descriptor
- *
- * Re-opens the drm fd which is useful in instances where a clean default
- * context is needed.
- */
-int gem_reopen_driver(int i915)
-{
-	char path[256];
-
-	snprintf(path, sizeof(path), "/proc/self/fd/%d", i915);
-	i915 = open(path, O_RDWR);
-	igt_assert_fd(i915);
-
-	return i915;
-}
lib/i915/gem.h +0 -2
index feabac8d..06dcb546 100644
@@ -30,6 +30,4 @@
  void igt_require_gem(int i915);
  void gem_quiescent_gpu(int i915);
 
-int gem_reopen_driver(int i915);
-
  #endif /* I915_GEM_H */
lib/i915/gem_ring.c +1 -1
index 6d28b5d9..eb2c7c2c 100644
@@ -149,7 +149,7 @@ gem_measure_ring_inflight(int fd, unsigned int engine, enum measure_ring_flags f
  {
  	unsigned int min = ~0u;
 
-	fd = gem_reopen_driver(fd);
+	fd = drm_reopen_driver(fd);
 
  	/* When available, disable execbuf throttling */
  	fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | O_NONBLOCK);
lib/i915/gem_submission.c +2 -2
index 0358802e..adf5eb39 100644
@@ -30,7 +30,6 @@
 
  #include <i915_drm.h>
 
-#include "i915/gem.h"
  #include "i915/gem_create.h"
  #include "i915/gem_engine_topology.h"
  #include "i915/gem_submission.h"
@@ -42,6 +41,7 @@
  #include "intel_chipset.h"
  #include "intel_reg.h"
  #include "ioctl_wrappers.h"
+#include "drmtest.h"
 
  /**
   * SECTION:gem_submission
@@ -158,7 +158,7 @@ void gem_test_all_engines(int i915)
  	};
  	const intel_ctx_t *ctx;
 
-	i915 = gem_reopen_driver(i915);
+	i915 = drm_reopen_driver(i915);
  	igt_assert(!is_wedged(i915));
 
  	ctx = intel_ctx_create_all_physical(i915);
tests/i915/api_intel_allocator.c +3 -3
index e9039a21..1263e0fb 100644
@@ -498,7 +498,7 @@ static void reopen(int fd)
 
  	igt_require_gem(fd);
 
-	fd2 = gem_reopen_driver(fd);
+	fd2 = drm_reopen_driver(fd);
 
  	__reopen_allocs(fd, fd2, true);
 
@@ -514,7 +514,7 @@ static void reopen_fork(int fd)
 
  	intel_allocator_multiprocess_start();
 
-	fd2 = gem_reopen_driver(fd);
+	fd2 = drm_reopen_driver(fd);
 
  	igt_fork(child, 2) {
  		igt_until_timeout(REOPEN_TIMEOUT)
@@ -681,7 +681,7 @@ static void fork_reopen_allocator(int fd, uint8_t type)
  		igt_assert(!intel_allocator_is_allocated(ctx_ahnd, 1, 123, offset));
  		intel_allocator_alloc(ctx_ahnd, 2, 123, 0);
 
-		fd = gem_reopen_driver(fd);
+		fd = drm_reopen_driver(fd);
  		fd_ahnd = intel_allocator_open(fd, 0, type);
  		igt_assert(!intel_allocator_is_allocated(fd_ahnd, 1, 123, offset));
  		intel_allocator_alloc(fd_ahnd, 2, 123, 0);
tests/i915/drm_fdinfo.c +1 -1
index 1b124755..ac668c29 100644
@@ -201,7 +201,7 @@ single(int gem_fd, const intel_ctx_t *ctx,
  		igt_require(!gem_using_guc_submission(gem_fd));
 
  	if (flags & TEST_ISOLATION) {
-		spin_fd = gem_reopen_driver(gem_fd);
+		spin_fd = drm_reopen_driver(gem_fd);
  		ctx = intel_ctx_create_all_physical(spin_fd);
  	} else {
  		spin_fd = gem_fd;
tests/i915/gem_barrier_race.c +1 -1
index f446aab6..faeec361 100644
@@ -95,7 +95,7 @@ static void intel_context_first_pin_last_unpin_loop(int fd, uint64_t engine, int
  	 */
  	const uint32_t batch[2] = { 0, MI_BATCH_BUFFER_END };
 
-	fd = gem_reopen_driver(fd);
+	fd = drm_reopen_driver(fd);
 
  	do {
  		uint32_t handle = gem_create(fd, 4096);
tests/i915/gem_close_race.c +2 -2
index 9c646f42..dc88eca4 100644
@@ -170,7 +170,7 @@ static void process(int fd, int child)
  {
  	uint32_t handle;
 
-	fd = gem_reopen_driver(fd);
+	fd = drm_reopen_driver(fd);
 
  	handle = load(fd);
  	if ((child & 63) == 63)
@@ -220,7 +220,7 @@ static void thread(int fd, struct drm_gem_open name,
 
  		memset(history, 0, sizeof(*history) * N_HISTORY);
 
-		crashme.fd = gem_reopen_driver(fd);
+		crashme.fd = drm_reopen_driver(fd);
 
  		memset(&its, 0, sizeof(its));
  		its.it_value.tv_nsec = msec(1) + (rand() % msec(150));
tests/i915/gem_concurrent_all.c +1 -1
index 25b7daf8..fb3b5f5d 100644
@@ -1465,7 +1465,7 @@ static void __run_forked(struct buffers *buffers,
  		int num_buffers;
 
  		/* recreate process local variables */
-		fd = gem_reopen_driver(fd);
+		fd = drm_reopen_driver(fd);
 
  		intel_allocator_init(); /* detach from thread */
  		num_buffers = buffers->num_buffers / num_children;
tests/i915/gem_ctx_create.c +1 -1
index 39f070af..a59abd08 100644
@@ -106,7 +106,7 @@ static void files(int core, const intel_ctx_cfg_t *cfg,
 
  		clock_gettime(CLOCK_MONOTONIC, &start);
  		do {
-			fd = gem_reopen_driver(core);
+			fd = drm_reopen_driver(core);
 
  			ctx = intel_ctx_create(fd, cfg);
  			execbuf.rsvd1 = ctx->id;
tests/i915/gem_ctx_exec.c +1 -1
index 3d94f01d..20fa1159 100644
@@ -282,7 +282,7 @@ static void nohangcheck_hostile(int i915)
  	 * we forcibly terminate that context.
  	 */
 
-	i915 = gem_reopen_driver(i915);
+	i915 = drm_reopen_driver(i915);
 
  	dir = igt_params_open(i915);
  	igt_require(dir != -1);
tests/i915/gem_ctx_param.c +1 -2
index d119ea74..2526b09c 100644
@@ -28,7 +28,6 @@
  #include <limits.h>
 
  #include "igt.h"
-#include "i915/gem.h"
  #include "i915/gem_create.h"
  #include "i915/gem_vm.h"
 
@@ -81,7 +80,7 @@ static void set_priority(int i915)
  	igt_permute_array(values, size, igt_exchange_int64);
 
  	igt_fork(flags, NEW_CTX | USER) {
-		int fd = gem_reopen_driver(i915);
+		int fd = drm_reopen_driver(i915);
  		struct drm_i915_gem_context_param arg = {
  			.param = I915_CONTEXT_PARAM_PRIORITY,
  			.ctx_id = flags & NEW_CTX ? gem_context_create(fd) : 0,
tests/i915/gem_ctx_persistence.c +6 -6
index 9fb52818..c0197cea 100644
@@ -598,7 +598,7 @@ static void test_nonpersistent_file(int i915)
  	 * has been made nonpersistent, in which case it must be terminated.
  	 */
 
-	i915 = gem_reopen_driver(i915);
+	i915 = drm_reopen_driver(i915);
 
  	ahnd = get_reloc_ahnd(i915, 0);
  	gem_context_set_persistence(i915, 0, false);
@@ -742,7 +742,7 @@ static void test_process(int i915)
  		uint64_t ahnd;
 
  		intel_allocator_init();
-		i915 = gem_reopen_driver(i915);
+		i915 = drm_reopen_driver(i915);
  		gem_quiescent_gpu(i915);
 
  		gem_context_set_persistence(i915, 0, false);
@@ -790,7 +790,7 @@ static void test_userptr(int i915)
  		uint64_t ahnd;
 
  		intel_allocator_init();
-		i915 = gem_reopen_driver(i915);
+		i915 = drm_reopen_driver(i915);
  		gem_quiescent_gpu(i915);
 
  		gem_context_set_persistence(i915, 0, false);
@@ -833,7 +833,7 @@ static void test_process_mixed(int pfd, const intel_ctx_cfg_t *cfg,
  	igt_fork(child, 1) {
  		int i915;
 
-		i915 = gem_reopen_driver(pfd);
+		i915 = drm_reopen_driver(pfd);
  		gem_quiescent_gpu(i915);
 
  		for (int persists = 0; persists <= 1; persists++) {
@@ -1000,7 +1000,7 @@ static void test_processes(int i915)
  			uint64_t ahnd;
 
  			intel_allocator_init();
-			i915 = gem_reopen_driver(i915);
+			i915 = drm_reopen_driver(i915);
  			gem_context_set_persistence(i915, 0, i);
 
  			ahnd = get_reloc_ahnd(i915, 0);
@@ -1069,7 +1069,7 @@ static void __smoker(int i915, const intel_ctx_cfg_t *cfg,
  	const intel_ctx_t *ctx;
  	uint64_t ahnd;
 
-	fd = gem_reopen_driver(i915);
+	fd = drm_reopen_driver(i915);
  	ctx = ctx_create_persistence(fd, cfg, expected > 0);
  	ahnd = get_reloc_ahnd(fd, ctx->id);
  	spin = igt_spin_new(fd, .ahnd = ahnd, .ctx = ctx, .engine = engine,
tests/i915/gem_ctx_shared.c +1 -1
index 3d73db58..8629992e 100644
@@ -206,7 +206,7 @@ static void exhaust_shared_gtt(int i915, unsigned int flags)
  		},
  	};
 
-	i915 = gem_reopen_driver(i915);
+	i915 = drm_reopen_driver(i915);
 
  	vm_create_ext.param.value = gem_vm_create(i915);
 
tests/i915/gem_eio.c +1 -1
index 8dbaa7a7..81e55e16 100644
@@ -450,7 +450,7 @@ static void set_heartbeat(int i915, int interval)
 
  static int reopen_device(int i915)
  {
-	i915 = gem_reopen_driver(i915);
+	i915 = drm_reopen_driver(i915);
  	igt_require_gem(i915);
  	set_heartbeat(i915, 250); /* require gem restores defaults */
 
tests/i915/gem_exec_alignment.c +3 -3
index a9fcd2a7..5059572f 100644
@@ -158,7 +158,7 @@ naughty_child(int i915, int link, uint32_t shared, unsigned int flags)
  	uint64_t elapsed;
 
  	if (flags & ISOLATED)
-		i915 = gem_reopen_driver(i915);
+		i915 = drm_reopen_driver(i915);
 
  	if (!(flags & SHARED))
  		shared = 0;
@@ -449,7 +449,7 @@ static void forked(int i915, int timeout)
  	struct drm_i915_gem_exec_object2 *obj;
  	unsigned long count;
 
-	i915 = gem_reopen_driver(i915);
+	i915 = drm_reopen_driver(i915);
  	igt_require(gem_uses_full_ppgtt(i915));
 
  	obj = setup_many(i915, &count);
@@ -457,7 +457,7 @@ static void forked(int i915, int timeout)
  		obj[i].handle = gem_flink(i915, obj[i].handle);
 
  	igt_fork(child, sysconf(_SC_NPROCESSORS_ONLN)) {
-		i915 = gem_reopen_driver(i915);
+		i915 = drm_reopen_driver(i915);
  		for (unsigned long i = 0; i < count; i++)
  			obj[i].handle = gem_open(i915, obj[i].handle);
  		__many(i915, timeout, obj, count);
tests/i915/gem_exec_capture.c +1 -1
index 9c391192..5d3e0905 100644
@@ -714,7 +714,7 @@ static void prioinv(int fd, int dir, const intel_ctx_t *ctx,
  	igt_fork(child, 1) {
  		const intel_ctx_t *ctx2;
  		int fence_out;
-		fd = gem_reopen_driver(fd);
+		fd = drm_reopen_driver(fd);
  		igt_debug("Submitting large capture [%ld x %dMiB objects]\n",
  			  count, (int)(size >> 20));
 
tests/i915/gem_exec_fair.c +1 -1
index 8208ab40..67af4739 100644
@@ -728,7 +728,7 @@ static void fairness(int i915, const intel_ctx_cfg_t *cfg,
  				if (common)
  					dmabuf = prime_handle_to_fd(i915, common);
 
-				i915 = gem_reopen_driver(i915);
+				i915 = drm_reopen_driver(i915);
 
  				if (dmabuf != -1)
  					common = prime_fd_to_handle(i915, dmabuf);
tests/i915/gem_exec_fence.c +1 -1
index c2d874f8..70f86da5 100644
@@ -1655,7 +1655,7 @@ static void test_invalid_timeline_fence_array(int fd)
  	uint64_t value;
  	void *ptr;
 
-	fd = gem_reopen_driver(fd);
+	fd = drm_reopen_driver(fd);
 
  	/* create an otherwise valid execbuf */
  	memset(&obj, 0, sizeof(obj));
tests/i915/gem_exec_nop.c +1 -1
index 497f57f0..f1ec23e8 100644
@@ -608,7 +608,7 @@ static void multiple(int fd, const intel_ctx_t *ctx,
  		int i915;
  		const intel_ctx_t *child_ctx;
 
-		i915 = gem_reopen_driver(fd);
+		i915 = drm_reopen_driver(fd);
  		child_ctx = intel_ctx_create(i915, &ctx->cfg);
  		execbuf.rsvd1 = child_ctx->id;
 
tests/i915/gem_exec_parallel.c +1 -1
index 705b22cb..97257ea4 100644
@@ -86,7 +86,7 @@ static void *thread(void *data)
  	pthread_mutex_unlock(t->mutex);
 
  	if (t->flags & FDS) {
-		fd = gem_reopen_driver(t->fd);
+		fd = drm_reopen_driver(t->fd);
  	} else {
  		fd = t->fd;
  	}
tests/i915/gem_exec_whisper.c +2 -2
index 29d96cdc..80e4b391 100644
@@ -98,7 +98,7 @@ static void init_hang(struct hang *h, int fd, const intel_ctx_cfg_t *cfg)
  	uint32_t *batch;
  	int i, gen;
 
-	h->fd = gem_reopen_driver(fd);
+	h->fd = drm_reopen_driver(fd);
  	igt_allow_hang(h->fd, 0, 0);
 
  	gen = intel_gen(intel_get_drm_devid(h->fd));
@@ -329,7 +329,7 @@ static void whisper(int fd, const intel_ctx_t *ctx,
 
  		if (flags & FDS) {
  			for (n = 0; n < 64; n++) {
-				fds[n] = gem_reopen_driver(fd);
+				fds[n] = drm_reopen_driver(fd);
  			}
  		}
  		if (flags & (CONTEXTS | QUEUES | FDS)) {
tests/i915/gem_lmem_evict.c +1 -1
index 71a066de..d2611bd5 100644
@@ -57,7 +57,7 @@ static void test_dontneed_evict_race(int fd,
  	igt_fork(child, 1) {
  		uint32_t handle2;
 
-		fd = gem_reopen_driver(fd);
+		fd = drm_reopen_driver(fd);
 
  		handle2 = gem_create_in_memory_region_list(fd,
  							   size, 0,
tests/i915/gem_lmem_swapping.c +3 -3
index 55b044ec..4177286b 100644
@@ -539,7 +539,7 @@ static void test_evict(int i915,
  	fill_params(i915, &params, region, flags, nproc, false);
 
  	if (flags & TEST_PARALLEL) {
-		int fd = gem_reopen_driver(i915);
+		int fd = drm_reopen_driver(i915);
 
  		intel_allocator_multiprocess_start();
  		ctx = intel_ctx_create_all_physical(fd);
@@ -610,7 +610,7 @@ static void test_smem_oom(int i915,
 
  	/* process for testing lmem eviction */
  	igt_fork(child, 1) {
-		int fd = gem_reopen_driver(i915);
+		int fd = drm_reopen_driver(i915);
  		struct params params;
 
  		fill_params(i915, &params, region, 0, 1, true);
@@ -637,7 +637,7 @@ static void test_smem_oom(int i915,
  				}
  			}
  			igt_fork(child, 1) {
-				int fd = gem_reopen_driver(i915);
+				int fd = drm_reopen_driver(i915);
 
  				for (int pass = 0; pass < num_alloc; pass++) {
  					if (READ_ONCE(*lmem_done))
tests/i915/gem_mmap_gtt.c +3 -4
index c14ab50e..0b3a6e5b 100644
@@ -41,7 +41,6 @@
  #include <sys/wait.h>
  #include "drm.h"
 
-#include "i915/gem.h"
  #include "i915/gem_create.h"
  #include "igt.h"
  #include "igt_sysfs.h"
@@ -360,8 +359,8 @@ static void
  test_isolation(int i915)
  {
  	struct drm_i915_gem_mmap_gtt mmap_arg;
-	int A = gem_reopen_driver(i915);
-	int B = gem_reopen_driver(i915);
+	int A = drm_reopen_driver(i915);
+	int B = drm_reopen_driver(i915);
  	uint64_t offset_a, offset_b;
  	uint32_t a, b;
  	void *ptr;
@@ -448,7 +447,7 @@ test_flink_race(int i915)
  	igt_assert(handles != MAP_FAILED);
 
  	igt_fork(child, ncpus + 1) {
-		int fd = gem_reopen_driver(i915);
+		int fd = drm_reopen_driver(i915);
 
  		do {
  			struct drm_i915_gem_mmap_gtt mmap_arg = {};
tests/i915/gem_mmap_offset.c +4 -5
index 962fc1b7..e7659e30 100644
@@ -33,7 +33,6 @@
  #include <unistd.h>
  #include "drm.h"
 
-#include "i915/gem.h"
  #include "i915/gem_create.h"
  #include "i915/intel_memory_region.h"
  #include "igt.h"
@@ -299,8 +298,8 @@ static void isolation(int i915)
  			struct drm_i915_gem_mmap_offset mmap_arg = {
  				.flags = t->type
  			};
-			int A = gem_reopen_driver(i915);
-			int B = gem_reopen_driver(i915);
+			int A = drm_reopen_driver(i915);
+			int B = drm_reopen_driver(i915);
  			uint64_t offset_a, offset_b;
  			uint32_t a, b;
  			void *ptr;
@@ -622,7 +621,7 @@ static void open_flood(int i915, int timeout)
  			continue;
 
  		igt_fork(child, 1) {
-			i915 = gem_reopen_driver(i915);
+			i915 = drm_reopen_driver(i915);
  			arg.handle = prime_fd_to_handle(i915, dmabuf);
 
  			do {
@@ -636,7 +635,7 @@ static void open_flood(int i915, int timeout)
  	igt_until_timeout(timeout) {
  		int tmp;
 
-		tmp = gem_reopen_driver(i915);
+		tmp = drm_reopen_driver(i915);
  		handle = prime_fd_to_handle(i915, dmabuf);
 
  		for_each_mmap_offset_type(i915, t) {
tests/i915/gem_reset_stats.c +15 -15
index 7b003d88..ddc61781 100644
@@ -267,7 +267,7 @@ static void test_rs(const struct intel_execution_ring *e,
  	igt_debug("num fds=%d, hang index=%d\n", num_fds, hang_index);
 
  	for (i = 0; i < num_fds; i++) {
-		fd[i] = gem_reopen_driver(device);
+		fd[i] = drm_reopen_driver(device);
  		assert_reset_status(i, fd[i], 0, RS_NO_ERROR);
  	}
 
@@ -318,7 +318,7 @@ static void test_rs_ctx(const struct intel_execution_ring *e,
  	test_rs(e, num_fds, -1, RS_NO_ERROR);
 
  	for (i = 0; i < num_fds; i++) {
-		fd[i] = gem_reopen_driver(device);
+		fd[i] = drm_reopen_driver(device);
  		igt_assert(fd[i]);
  		assert_reset_status(i, fd[i], 0, RS_NO_ERROR);
 
@@ -384,8 +384,8 @@ static void test_ban(const struct intel_execution_ring *e)
  	int ban, retry = 10;
  	int active_count = 0;
 
-	fd_bad = gem_reopen_driver(device);
-	fd_good = gem_reopen_driver(device);
+	fd_bad = drm_reopen_driver(device);
+	fd_good = drm_reopen_driver(device);
 
  	assert_reset_status(fd_bad, fd_bad, 0, RS_NO_ERROR);
  	assert_reset_status(fd_good, fd_good, 0, RS_NO_ERROR);
@@ -438,7 +438,7 @@ static void test_ban_ctx(const struct intel_execution_ring *e)
  	uint32_t ctx_good, ctx_bad;
  	int active_count = 0;
 
-	fd = gem_reopen_driver(device);
+	fd = drm_reopen_driver(device);
 
  	assert_reset_status(fd, fd, 0, RS_NO_ERROR);
 
@@ -494,8 +494,8 @@ static void test_unrelated_ctx(const struct intel_execution_ring *e)
  	int fd1,fd2;
  	int ctx_guilty, ctx_unrelated;
 
-	fd1 = gem_reopen_driver(device);
-	fd2 = gem_reopen_driver(device);
+	fd1 = drm_reopen_driver(device);
+	fd2 = drm_reopen_driver(device);
  	assert_reset_status(0, fd1, 0, RS_NO_ERROR);
  	assert_reset_status(1, fd2, 0, RS_NO_ERROR);
  	ctx_guilty = gem_context_create(fd1);
@@ -530,7 +530,7 @@ static int get_reset_count(int fd, int ctx)
 
  static void test_close_pending_ctx(const struct intel_execution_ring *e)
  {
-	int fd = gem_reopen_driver(device);
+	int fd = drm_reopen_driver(device);
  	uint32_t ctx = gem_context_create(fd);
 
  	assert_reset_status(fd, fd, ctx, RS_NO_ERROR);
@@ -544,7 +544,7 @@ static void test_close_pending_ctx(const struct intel_execution_ring *e)
 
  static void test_close_pending(const struct intel_execution_ring *e)
  {
-	int fd = gem_reopen_driver(device);
+	int fd = drm_reopen_driver(device);
 
  	assert_reset_status(fd, fd, 0, RS_NO_ERROR);
 
@@ -588,7 +588,7 @@ static void noop_on_each_ring(int fd, const bool reverse)
  static void test_close_pending_fork(const struct intel_execution_ring *e,
  				    const bool reverse)
  {
-	int fd = gem_reopen_driver(device);
+	int fd = drm_reopen_driver(device);
  	igt_hang_t hang;
  	int pid;
 
@@ -603,7 +603,7 @@ static void test_close_pending_fork(const struct intel_execution_ring *e,
  	 */
  	pid = fork();
  	if (pid == 0) {
-		const int fd2 = gem_reopen_driver(device);
+		const int fd2 = drm_reopen_driver(device);
  		igt_assert_lte(0, fd2);
 
  		/* The crucial component is that we schedule the same noop batch
@@ -630,7 +630,7 @@ static void test_close_pending_fork(const struct intel_execution_ring *e,
  static void test_reset_count(const struct intel_execution_ring *e,
  			     const bool create_ctx)
  {
-	int fd = gem_reopen_driver(device);
+	int fd = drm_reopen_driver(device);
  	int ctx;
  	long c1, c2;
 
@@ -733,7 +733,7 @@ static void test_params_ctx(void)
  {
  	int fd;
 
-	fd = gem_reopen_driver(device);
+	fd = drm_reopen_driver(device);
  	_test_param(fd, gem_context_create(fd));
  	close(fd);
  }
@@ -742,7 +742,7 @@ static void test_params(void)
  {
  	int fd;
 
-	fd = gem_reopen_driver(device);
+	fd = drm_reopen_driver(device);
  	_test_param(fd, 0);
  	close(fd);
  }
@@ -767,7 +767,7 @@ static void defer_hangcheck(const struct intel_execution_ring *engine)
  	int fd, count_start, count_end;
  	int seconds = 30;
 
-	fd = gem_reopen_driver(device);
+	fd = drm_reopen_driver(device);
 
  	next = next_engine(fd, engine);
  	igt_skip_on(next == engine);
tests/i915/gem_ringfill.c +1 -1
index afcd7b73..de6e26bf 100644
@@ -219,7 +219,7 @@ static void run_test(int fd, const intel_ctx_t *ctx, unsigned ring,
  		igt_fork(child, nchild) {
  			const intel_ctx_t *child_ctx = NULL;
  			if (flags & NEWFD) {
-				fd = gem_reopen_driver(fd);
+				fd = drm_reopen_driver(fd);
  				child_ctx = intel_ctx_create(fd, &ctx->cfg);
 
  				setup_execbuf(fd, child_ctx, &execbuf, obj, reloc, ring);
tests/i915/gem_softpin.c +1 -1
index 8717860b..933daa4a 100644
@@ -1160,7 +1160,7 @@ static void *thread(void *data)
  	uint32_t batch = MI_BATCH_BUFFER_END;
  	int fd, ret, succeeded = 0;
 
-	fd = gem_reopen_driver(t->fd);
+	fd = drm_reopen_driver(t->fd);
  	ctx = intel_ctx_create(fd, &t->ctx->cfg);
  	offset_obj = gem_detect_safe_start_offset(fd);
  	offset_bb = ALIGN(offset_obj + 4096, gem_detect_safe_alignment(fd));
tests/i915/gem_userptr_blits.c +1 -1
index b00afc32..baba7cf3 100644
@@ -669,7 +669,7 @@ static void test_nohangcheck_hostile(int i915)
  	 * Even if the user disables hangcheck, we must still recover.
  	 */
 
-	i915 = gem_reopen_driver(i915);
+	i915 = drm_reopen_driver(i915);
  	gem_require_contexts(i915);
 
  	dir = igt_params_open(i915);
tests/i915/gem_vm_create.c +1 -1
index f47d8c55..44958cce 100644
@@ -306,7 +306,7 @@ static void isolation(int i915)
  	struct drm_i915_gem_context_param arg = {
  		.param = I915_CONTEXT_PARAM_VM,
  	};
-	int other = gem_reopen_driver(i915);
+	int other = drm_reopen_driver(i915);
  	uint32_t ctx[2], vm[2], result;
  	int loops = 4096;
 
tests/i915/gem_watchdog.c +1 -1
index 27f3a2d7..47ccd2ca 100644
@@ -564,7 +564,7 @@ igt_main
  					timeout * 1000);
  		default_timeout_wait_s = timeout * 5;
 
-		i915 = gem_reopen_driver(i915); /* Apply modparam. */
+		i915 = drm_reopen_driver(i915); /* Apply modparam. */
  		ctx = intel_ctx_create_all_physical(i915);
  	}
 
tests/i915/gem_workarounds.c +1 -1
index 7d119962..ae544adb 100644
@@ -198,7 +198,7 @@ static void check_workarounds(int fd, enum operation op, unsigned int flags)
  	const intel_ctx_t *ctx;
 
  	if (flags & FD)
-		fd = gem_reopen_driver(fd);
+		fd = drm_reopen_driver(fd);
 
  	ctx = intel_ctx_0(fd);
  	if (flags & CONTEXT) {
tests/i915/i915_suspend.c +1 -1
index a9507964..5b289ecb 100644
@@ -178,7 +178,7 @@ test_shrink(int fd, unsigned int mode)
  	gem_quiescent_gpu(fd);
 
  	igt_multi_fork(child, 1) {
-		fd = gem_reopen_driver(fd);
+		fd = drm_reopen_driver(fd);
  		igt_purge_vm_caches(fd);
 
  		mem = igt_get_total_pinnable_mem(&size);
tests/i915/perf.c +1 -1
index 9ca4d34b..cd73b1a9 100644
@@ -4513,7 +4513,7 @@ gen12_test_single_ctx_render_target_writes_a_counter(const struct intel_executio
  	do {
  		igt_fork_helper(&child) {
  			/* A local device for local resources. */
-			drm_fd = gem_reopen_driver(drm_fd);
+			drm_fd = drm_reopen_driver(drm_fd);
 
  			igt_drop_root();
  			gen12_single_ctx_helper(e);
#2 lore raw
Quoted 11 lines · Anna

I forgot to add someone to the To/CC.
Adding @Zbigniew and @Kamil.

Quoted 7 lines · Anna Karas

We need an equivalent of gem_reopen_driver() in XE. In order to not duplicate the code, move gem_reopen_driver() one directory up from lib/i915 to lib as drm_reopen_driver() so XE can use it too.

Rename gem_reopen_driver() across files.

I'm not sure rename is necessary but I won't block this change. Each driver can acquire new fd on same device so:

Before merge just wait some period of time to receive comments from other devs. Maybe they have different opinion than mine.

--
Zbigniew

Quoted 740 lines
Quoted 740 lines
---
  lib/drmtest.c                    | 18 ++++++++++++++++++
  lib/drmtest.h                    |  2 ++
  lib/i915/gem.c                   | 20 +-------------------
  lib/i915/gem.h                   |  2 --
  lib/i915/gem_ring.c              |  2 +-
  lib/i915/gem_submission.c        |  4 ++--
  tests/i915/api_intel_allocator.c |  6 +++---
  tests/i915/drm_fdinfo.c          |  2 +-
  tests/i915/gem_barrier_race.c    |  2 +-
  tests/i915/gem_close_race.c      |  4 ++--
  tests/i915/gem_concurrent_all.c  |  2 +-
  tests/i915/gem_ctx_create.c      |  2 +-
  tests/i915/gem_ctx_exec.c        |  2 +-
  tests/i915/gem_ctx_param.c       |  3 +--
  tests/i915/gem_ctx_persistence.c | 12 ++++++------
  tests/i915/gem_ctx_shared.c      |  2 +-
  tests/i915/gem_eio.c             |  2 +-
  tests/i915/gem_exec_alignment.c  |  6 +++---
  tests/i915/gem_exec_capture.c    |  2 +-
  tests/i915/gem_exec_fair.c       |  2 +-
  tests/i915/gem_exec_fence.c      |  2 +-
  tests/i915/gem_exec_nop.c        |  2 +-
  tests/i915/gem_exec_parallel.c   |  2 +-
  tests/i915/gem_exec_whisper.c    |  4 ++--
  tests/i915/gem_lmem_evict.c      |  2 +-
  tests/i915/gem_lmem_swapping.c   |  6 +++---
  tests/i915/gem_mmap_gtt.c        |  7 +++----
  tests/i915/gem_mmap_offset.c     |  9 ++++-----
  tests/i915/gem_reset_stats.c     | 30 +++++++++++++++---------------
  tests/i915/gem_ringfill.c        |  2 +-
  tests/i915/gem_softpin.c         |  2 +-
  tests/i915/gem_userptr_blits.c   |  2 +-
  tests/i915/gem_vm_create.c       |  2 +-
  tests/i915/gem_watchdog.c        |  2 +-
  tests/i915/gem_workarounds.c     |  2 +-
  tests/i915/i915_suspend.c        |  2 +-
  tests/i915/perf.c                |  2 +-
  37 files changed, 87 insertions(+), 90 deletions(-)
lib/drmtest.c +18 -0
index c91a9142..72eae7af 100644
@@ -652,6 +652,24 @@ int drm_open_driver_render(int chipset)
  	return fd;
  }
+/**
+ * drm_reopen_driver:
+ * @fd: re-open the drm file descriptor
+ *
+ * Re-opens the drm fd which is useful in instances where a clean default
+ * context is needed.
+ */
+int drm_reopen_driver(int fd)
+{
+	char path[256];
+
+	snprintf(path, sizeof(path), "/proc/self/fd/%d", fd);
+	fd = open(path, O_RDWR);
+	igt_assert_fd(fd);
+
+	return fd;
+}
+
  void igt_require_amdgpu(int fd)
  {
  	igt_require(is_amdgpu_device(fd));
lib/drmtest.h +2 -0
index 5878f651..9b7a81b6 100644
@@ -98,6 +98,8 @@ int __drm_open_driver_another(int idx, int chipset);
  int __drm_open_driver(int chipset);
  int __drm_open_driver_render(int chipset);
+int drm_reopen_driver(int fd);
+
  void igt_require_amdgpu(int fd);
  void igt_require_intel(int fd);
  void igt_require_i915(int fd);
lib/i915/gem.c +1 -19
index ed45a9ed..6da3e5c9 100644
@@ -147,7 +147,7 @@ void igt_require_gem(int i915)
  	 * of a wedged device, not for actually waiting on outstanding
  	 * requests! So create a new drm_file for the device that is clean.
  	 */
-	i915 = gem_reopen_driver(i915);
+	i915 = drm_reopen_driver(i915);
  	/*
  	 * Reset the global seqno at the start of each test. This ensures that
@@ -189,21 +189,3 @@ void gem_quiescent_gpu(int i915)
  	igt_drop_caches_set(i915,
  			    DROP_ACTIVE | DROP_RETIRE | DROP_IDLE | DROP_FREED);
  }
-
-/**
- * gem_reopen_driver:
- * @i915: re-open the i915 drm file descriptor
- *
- * Re-opens the drm fd which is useful in instances where a clean default
- * context is needed.
- */
-int gem_reopen_driver(int i915)
-{
-	char path[256];
-
-	snprintf(path, sizeof(path), "/proc/self/fd/%d", i915);
-	i915 = open(path, O_RDWR);
-	igt_assert_fd(i915);
-
-	return i915;
-}
lib/i915/gem.h +0 -2
index feabac8d..06dcb546 100644
@@ -30,6 +30,4 @@
  void igt_require_gem(int i915);
  void gem_quiescent_gpu(int i915);
-int gem_reopen_driver(int i915);
-
  #endif /* I915_GEM_H */
lib/i915/gem_ring.c +1 -1
index 6d28b5d9..eb2c7c2c 100644
@@ -149,7 +149,7 @@ gem_measure_ring_inflight(int fd, unsigned int engine, enum measure_ring_flags f
  {
  	unsigned int min = ~0u;
-	fd = gem_reopen_driver(fd);
+	fd = drm_reopen_driver(fd);
  	/* When available, disable execbuf throttling */
  	fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | O_NONBLOCK);
lib/i915/gem_submission.c +2 -2
index 0358802e..adf5eb39 100644
@@ -30,7 +30,6 @@
  #include <i915_drm.h>
-#include "i915/gem.h"
  #include "i915/gem_create.h"
  #include "i915/gem_engine_topology.h"
  #include "i915/gem_submission.h"
@@ -42,6 +41,7 @@
  #include "intel_chipset.h"
  #include "intel_reg.h"
  #include "ioctl_wrappers.h"
+#include "drmtest.h"
  /**
   * SECTION:gem_submission
@@ -158,7 +158,7 @@ void gem_test_all_engines(int i915)
  	};
  	const intel_ctx_t *ctx;
-	i915 = gem_reopen_driver(i915);
+	i915 = drm_reopen_driver(i915);
  	igt_assert(!is_wedged(i915));
  	ctx = intel_ctx_create_all_physical(i915);
tests/i915/api_intel_allocator.c +3 -3
index e9039a21..1263e0fb 100644
@@ -498,7 +498,7 @@ static void reopen(int fd)
  	igt_require_gem(fd);
-	fd2 = gem_reopen_driver(fd);
+	fd2 = drm_reopen_driver(fd);
  	__reopen_allocs(fd, fd2, true);
@@ -514,7 +514,7 @@ static void reopen_fork(int fd)
  	intel_allocator_multiprocess_start();
-	fd2 = gem_reopen_driver(fd);
+	fd2 = drm_reopen_driver(fd);
  	igt_fork(child, 2) {
  		igt_until_timeout(REOPEN_TIMEOUT)
@@ -681,7 +681,7 @@ static void fork_reopen_allocator(int fd, uint8_t type)
  		igt_assert(!intel_allocator_is_allocated(ctx_ahnd, 1, 123, offset));
  		intel_allocator_alloc(ctx_ahnd, 2, 123, 0);
-		fd = gem_reopen_driver(fd);
+		fd = drm_reopen_driver(fd);
  		fd_ahnd = intel_allocator_open(fd, 0, type);
  		igt_assert(!intel_allocator_is_allocated(fd_ahnd, 1, 123, offset));
  		intel_allocator_alloc(fd_ahnd, 2, 123, 0);
tests/i915/drm_fdinfo.c +1 -1
index 1b124755..ac668c29 100644
@@ -201,7 +201,7 @@ single(int gem_fd, const intel_ctx_t *ctx,
  		igt_require(!gem_using_guc_submission(gem_fd));
  	if (flags & TEST_ISOLATION) {
-		spin_fd = gem_reopen_driver(gem_fd);
+		spin_fd = drm_reopen_driver(gem_fd);
  		ctx = intel_ctx_create_all_physical(spin_fd);
  	} else {
  		spin_fd = gem_fd;
tests/i915/gem_barrier_race.c +1 -1
index f446aab6..faeec361 100644
@@ -95,7 +95,7 @@ static void intel_context_first_pin_last_unpin_loop(int fd, uint64_t engine, int
  	 */
  	const uint32_t batch[2] = { 0, MI_BATCH_BUFFER_END };
-	fd = gem_reopen_driver(fd);
+	fd = drm_reopen_driver(fd);
  	do {
  		uint32_t handle = gem_create(fd, 4096);
tests/i915/gem_close_race.c +2 -2
index 9c646f42..dc88eca4 100644
@@ -170,7 +170,7 @@ static void process(int fd, int child)
  {
  	uint32_t handle;
-	fd = gem_reopen_driver(fd);
+	fd = drm_reopen_driver(fd);
  	handle = load(fd);
  	if ((child & 63) == 63)
@@ -220,7 +220,7 @@ static void thread(int fd, struct drm_gem_open name,
  		memset(history, 0, sizeof(*history) * N_HISTORY);
-		crashme.fd = gem_reopen_driver(fd);
+		crashme.fd = drm_reopen_driver(fd);
  		memset(&its, 0, sizeof(its));
  		its.it_value.tv_nsec = msec(1) + (rand() % msec(150));
tests/i915/gem_concurrent_all.c +1 -1
index 25b7daf8..fb3b5f5d 100644
@@ -1465,7 +1465,7 @@ static void __run_forked(struct buffers *buffers,
  		int num_buffers;
  		/* recreate process local variables */
-		fd = gem_reopen_driver(fd);
+		fd = drm_reopen_driver(fd);
  		intel_allocator_init(); /* detach from thread */
  		num_buffers = buffers->num_buffers / num_children;
tests/i915/gem_ctx_create.c +1 -1
index 39f070af..a59abd08 100644
@@ -106,7 +106,7 @@ static void files(int core, const intel_ctx_cfg_t *cfg,
  		clock_gettime(CLOCK_MONOTONIC, &start);
  		do {
-			fd = gem_reopen_driver(core);
+			fd = drm_reopen_driver(core);
  			ctx = intel_ctx_create(fd, cfg);
  			execbuf.rsvd1 = ctx->id;
tests/i915/gem_ctx_exec.c +1 -1
index 3d94f01d..20fa1159 100644
@@ -282,7 +282,7 @@ static void nohangcheck_hostile(int i915)
  	 * we forcibly terminate that context.
  	 */
-	i915 = gem_reopen_driver(i915);
+	i915 = drm_reopen_driver(i915);
  	dir = igt_params_open(i915);
  	igt_require(dir != -1);
tests/i915/gem_ctx_param.c +1 -2
index d119ea74..2526b09c 100644
@@ -28,7 +28,6 @@
  #include <limits.h>
  #include "igt.h"
-#include "i915/gem.h"
  #include "i915/gem_create.h"
  #include "i915/gem_vm.h"
@@ -81,7 +80,7 @@ static void set_priority(int i915)
  	igt_permute_array(values, size, igt_exchange_int64);
  	igt_fork(flags, NEW_CTX | USER) {
-		int fd = gem_reopen_driver(i915);
+		int fd = drm_reopen_driver(i915);
  		struct drm_i915_gem_context_param arg = {
  			.param = I915_CONTEXT_PARAM_PRIORITY,
  			.ctx_id = flags & NEW_CTX ? gem_context_create(fd) : 0,
tests/i915/gem_ctx_persistence.c +6 -6
index 9fb52818..c0197cea 100644
@@ -598,7 +598,7 @@ static void test_nonpersistent_file(int i915)
  	 * has been made nonpersistent, in which case it must be terminated.
  	 */
-	i915 = gem_reopen_driver(i915);
+	i915 = drm_reopen_driver(i915);
  	ahnd = get_reloc_ahnd(i915, 0);
  	gem_context_set_persistence(i915, 0, false);
@@ -742,7 +742,7 @@ static void test_process(int i915)
  		uint64_t ahnd;
  		intel_allocator_init();
-		i915 = gem_reopen_driver(i915);
+		i915 = drm_reopen_driver(i915);
  		gem_quiescent_gpu(i915);
  		gem_context_set_persistence(i915, 0, false);
@@ -790,7 +790,7 @@ static void test_userptr(int i915)
  		uint64_t ahnd;
  		intel_allocator_init();
-		i915 = gem_reopen_driver(i915);
+		i915 = drm_reopen_driver(i915);
  		gem_quiescent_gpu(i915);
  		gem_context_set_persistence(i915, 0, false);
@@ -833,7 +833,7 @@ static void test_process_mixed(int pfd, const intel_ctx_cfg_t *cfg,
  	igt_fork(child, 1) {
  		int i915;
-		i915 = gem_reopen_driver(pfd);
+		i915 = drm_reopen_driver(pfd);
  		gem_quiescent_gpu(i915);
  		for (int persists = 0; persists <= 1; persists++) {
@@ -1000,7 +1000,7 @@ static void test_processes(int i915)
  			uint64_t ahnd;
  			intel_allocator_init();
-			i915 = gem_reopen_driver(i915);
+			i915 = drm_reopen_driver(i915);
  			gem_context_set_persistence(i915, 0, i);
  			ahnd = get_reloc_ahnd(i915, 0);
@@ -1069,7 +1069,7 @@ static void __smoker(int i915, const intel_ctx_cfg_t *cfg,
  	const intel_ctx_t *ctx;
  	uint64_t ahnd;
-	fd = gem_reopen_driver(i915);
+	fd = drm_reopen_driver(i915);
  	ctx = ctx_create_persistence(fd, cfg, expected > 0);
  	ahnd = get_reloc_ahnd(fd, ctx->id);
  	spin = igt_spin_new(fd, .ahnd = ahnd, .ctx = ctx, .engine = engine,
tests/i915/gem_ctx_shared.c +1 -1
index 3d73db58..8629992e 100644
@@ -206,7 +206,7 @@ static void exhaust_shared_gtt(int i915, unsigned int flags)
  		},
  	};
-	i915 = gem_reopen_driver(i915);
+	i915 = drm_reopen_driver(i915);
  	vm_create_ext.param.value = gem_vm_create(i915);
tests/i915/gem_eio.c +1 -1
index 8dbaa7a7..81e55e16 100644
@@ -450,7 +450,7 @@ static void set_heartbeat(int i915, int interval)
  static int reopen_device(int i915)
  {
-	i915 = gem_reopen_driver(i915);
+	i915 = drm_reopen_driver(i915);
  	igt_require_gem(i915);
  	set_heartbeat(i915, 250); /* require gem restores defaults */
tests/i915/gem_exec_alignment.c +3 -3
index a9fcd2a7..5059572f 100644
@@ -158,7 +158,7 @@ naughty_child(int i915, int link, uint32_t shared, unsigned int flags)
  	uint64_t elapsed;
  	if (flags & ISOLATED)
-		i915 = gem_reopen_driver(i915);
+		i915 = drm_reopen_driver(i915);
  	if (!(flags & SHARED))
  		shared = 0;
@@ -449,7 +449,7 @@ static void forked(int i915, int timeout)
  	struct drm_i915_gem_exec_object2 *obj;
  	unsigned long count;
-	i915 = gem_reopen_driver(i915);
+	i915 = drm_reopen_driver(i915);
  	igt_require(gem_uses_full_ppgtt(i915));
  	obj = setup_many(i915, &count);
@@ -457,7 +457,7 @@ static void forked(int i915, int timeout)
  		obj[i].handle = gem_flink(i915, obj[i].handle);
  	igt_fork(child, sysconf(_SC_NPROCESSORS_ONLN)) {
-		i915 = gem_reopen_driver(i915);
+		i915 = drm_reopen_driver(i915);
  		for (unsigned long i = 0; i < count; i++)
  			obj[i].handle = gem_open(i915, obj[i].handle);
  		__many(i915, timeout, obj, count);
tests/i915/gem_exec_capture.c +1 -1
index 9c391192..5d3e0905 100644
@@ -714,7 +714,7 @@ static void prioinv(int fd, int dir, const intel_ctx_t *ctx,
  	igt_fork(child, 1) {
  		const intel_ctx_t *ctx2;
  		int fence_out;
-		fd = gem_reopen_driver(fd);
+		fd = drm_reopen_driver(fd);
  		igt_debug("Submitting large capture [%ld x %dMiB objects]\n",
  			  count, (int)(size >> 20));
tests/i915/gem_exec_fair.c +1 -1
index 8208ab40..67af4739 100644
@@ -728,7 +728,7 @@ static void fairness(int i915, const intel_ctx_cfg_t *cfg,
  				if (common)
  					dmabuf = prime_handle_to_fd(i915, common);
-				i915 = gem_reopen_driver(i915);
+				i915 = drm_reopen_driver(i915);
  				if (dmabuf != -1)
  					common = prime_fd_to_handle(i915, dmabuf);
tests/i915/gem_exec_fence.c +1 -1
index c2d874f8..70f86da5 100644
@@ -1655,7 +1655,7 @@ static void test_invalid_timeline_fence_array(int fd)
  	uint64_t value;
  	void *ptr;
-	fd = gem_reopen_driver(fd);
+	fd = drm_reopen_driver(fd);
  	/* create an otherwise valid execbuf */
  	memset(&obj, 0, sizeof(obj));
tests/i915/gem_exec_nop.c +1 -1
index 497f57f0..f1ec23e8 100644
@@ -608,7 +608,7 @@ static void multiple(int fd, const intel_ctx_t *ctx,
  		int i915;
  		const intel_ctx_t *child_ctx;
-		i915 = gem_reopen_driver(fd);
+		i915 = drm_reopen_driver(fd);
  		child_ctx = intel_ctx_create(i915, &ctx->cfg);
  		execbuf.rsvd1 = child_ctx->id;
tests/i915/gem_exec_parallel.c +1 -1
index 705b22cb..97257ea4 100644
@@ -86,7 +86,7 @@ static void *thread(void *data)
  	pthread_mutex_unlock(t->mutex);
  	if (t->flags & FDS) {
-		fd = gem_reopen_driver(t->fd);
+		fd = drm_reopen_driver(t->fd);
  	} else {
  		fd = t->fd;
  	}
tests/i915/gem_exec_whisper.c +2 -2
index 29d96cdc..80e4b391 100644
@@ -98,7 +98,7 @@ static void init_hang(struct hang *h, int fd, const intel_ctx_cfg_t *cfg)
  	uint32_t *batch;
  	int i, gen;
-	h->fd = gem_reopen_driver(fd);
+	h->fd = drm_reopen_driver(fd);
  	igt_allow_hang(h->fd, 0, 0);
  	gen = intel_gen(intel_get_drm_devid(h->fd));
@@ -329,7 +329,7 @@ static void whisper(int fd, const intel_ctx_t *ctx,
  		if (flags & FDS) {
  			for (n = 0; n < 64; n++) {
-				fds[n] = gem_reopen_driver(fd);
+				fds[n] = drm_reopen_driver(fd);
  			}
  		}
  		if (flags & (CONTEXTS | QUEUES | FDS)) {
tests/i915/gem_lmem_evict.c +1 -1
index 71a066de..d2611bd5 100644
@@ -57,7 +57,7 @@ static void test_dontneed_evict_race(int fd,
  	igt_fork(child, 1) {
  		uint32_t handle2;
-		fd = gem_reopen_driver(fd);
+		fd = drm_reopen_driver(fd);
  		handle2 = gem_create_in_memory_region_list(fd,
  							   size, 0,
tests/i915/gem_lmem_swapping.c +3 -3
index 55b044ec..4177286b 100644
@@ -539,7 +539,7 @@ static void test_evict(int i915,
  	fill_params(i915, &params, region, flags, nproc, false);
  	if (flags & TEST_PARALLEL) {
-		int fd = gem_reopen_driver(i915);
+		int fd = drm_reopen_driver(i915);
  		intel_allocator_multiprocess_start();
  		ctx = intel_ctx_create_all_physical(fd);
@@ -610,7 +610,7 @@ static void test_smem_oom(int i915,
  	/* process for testing lmem eviction */
  	igt_fork(child, 1) {
-		int fd = gem_reopen_driver(i915);
+		int fd = drm_reopen_driver(i915);
  		struct params params;
  		fill_params(i915, &params, region, 0, 1, true);
@@ -637,7 +637,7 @@ static void test_smem_oom(int i915,
  				}
  			}
  			igt_fork(child, 1) {
-				int fd = gem_reopen_driver(i915);
+				int fd = drm_reopen_driver(i915);
  				for (int pass = 0; pass < num_alloc; pass++) {
  					if (READ_ONCE(*lmem_done))
tests/i915/gem_mmap_gtt.c +3 -4
index c14ab50e..0b3a6e5b 100644
@@ -41,7 +41,6 @@
  #include <sys/wait.h>
  #include "drm.h"
-#include "i915/gem.h"
  #include "i915/gem_create.h"
  #include "igt.h"
  #include "igt_sysfs.h"
@@ -360,8 +359,8 @@ static void
  test_isolation(int i915)
  {
  	struct drm_i915_gem_mmap_gtt mmap_arg;
-	int A = gem_reopen_driver(i915);
-	int B = gem_reopen_driver(i915);
+	int A = drm_reopen_driver(i915);
+	int B = drm_reopen_driver(i915);
  	uint64_t offset_a, offset_b;
  	uint32_t a, b;
  	void *ptr;
@@ -448,7 +447,7 @@ test_flink_race(int i915)
  	igt_assert(handles != MAP_FAILED);
  	igt_fork(child, ncpus + 1) {
-		int fd = gem_reopen_driver(i915);
+		int fd = drm_reopen_driver(i915);
  		do {
  			struct drm_i915_gem_mmap_gtt mmap_arg = {};
tests/i915/gem_mmap_offset.c +4 -5
index 962fc1b7..e7659e30 100644
@@ -33,7 +33,6 @@
  #include <unistd.h>
  #include "drm.h"
-#include "i915/gem.h"
  #include "i915/gem_create.h"
  #include "i915/intel_memory_region.h"
  #include "igt.h"
@@ -299,8 +298,8 @@ static void isolation(int i915)
  			struct drm_i915_gem_mmap_offset mmap_arg = {
  				.flags = t->type
  			};
-			int A = gem_reopen_driver(i915);
-			int B = gem_reopen_driver(i915);
+			int A = drm_reopen_driver(i915);
+			int B = drm_reopen_driver(i915);
  			uint64_t offset_a, offset_b;
  			uint32_t a, b;
  			void *ptr;
@@ -622,7 +621,7 @@ static void open_flood(int i915, int timeout)
  			continue;
  		igt_fork(child, 1) {
-			i915 = gem_reopen_driver(i915);
+			i915 = drm_reopen_driver(i915);
  			arg.handle = prime_fd_to_handle(i915, dmabuf);
  			do {
@@ -636,7 +635,7 @@ static void open_flood(int i915, int timeout)
  	igt_until_timeout(timeout) {
  		int tmp;
-		tmp = gem_reopen_driver(i915);
+		tmp = drm_reopen_driver(i915);
  		handle = prime_fd_to_handle(i915, dmabuf);
  		for_each_mmap_offset_type(i915, t) {
tests/i915/gem_reset_stats.c +15 -15
index 7b003d88..ddc61781 100644
@@ -267,7 +267,7 @@ static void test_rs(const struct intel_execution_ring *e,
  	igt_debug("num fds=%d, hang index=%d\n", num_fds, hang_index);
  	for (i = 0; i < num_fds; i++) {
-		fd[i] = gem_reopen_driver(device);
+		fd[i] = drm_reopen_driver(device);
  		assert_reset_status(i, fd[i], 0, RS_NO_ERROR);
  	}
@@ -318,7 +318,7 @@ static void test_rs_ctx(const struct intel_execution_ring *e,
  	test_rs(e, num_fds, -1, RS_NO_ERROR);
  	for (i = 0; i < num_fds; i++) {
-		fd[i] = gem_reopen_driver(device);
+		fd[i] = drm_reopen_driver(device);
  		igt_assert(fd[i]);
  		assert_reset_status(i, fd[i], 0, RS_NO_ERROR);
@@ -384,8 +384,8 @@ static void test_ban(const struct intel_execution_ring *e)
  	int ban, retry = 10;
  	int active_count = 0;
-	fd_bad = gem_reopen_driver(device);
-	fd_good = gem_reopen_driver(device);
+	fd_bad = drm_reopen_driver(device);
+	fd_good = drm_reopen_driver(device);
  	assert_reset_status(fd_bad, fd_bad, 0, RS_NO_ERROR);
  	assert_reset_status(fd_good, fd_good, 0, RS_NO_ERROR);
@@ -438,7 +438,7 @@ static void test_ban_ctx(const struct intel_execution_ring *e)
  	uint32_t ctx_good, ctx_bad;
  	int active_count = 0;
-	fd = gem_reopen_driver(device);
+	fd = drm_reopen_driver(device);
  	assert_reset_status(fd, fd, 0, RS_NO_ERROR);
@@ -494,8 +494,8 @@ static void test_unrelated_ctx(const struct intel_execution_ring *e)
  	int fd1,fd2;
  	int ctx_guilty, ctx_unrelated;
-	fd1 = gem_reopen_driver(device);
-	fd2 = gem_reopen_driver(device);
+	fd1 = drm_reopen_driver(device);
+	fd2 = drm_reopen_driver(device);
  	assert_reset_status(0, fd1, 0, RS_NO_ERROR);
  	assert_reset_status(1, fd2, 0, RS_NO_ERROR);
  	ctx_guilty = gem_context_create(fd1);
@@ -530,7 +530,7 @@ static int get_reset_count(int fd, int ctx)
  static void test_close_pending_ctx(const struct intel_execution_ring *e)
  {
-	int fd = gem_reopen_driver(device);
+	int fd = drm_reopen_driver(device);
  	uint32_t ctx = gem_context_create(fd);
  	assert_reset_status(fd, fd, ctx, RS_NO_ERROR);
@@ -544,7 +544,7 @@ static void test_close_pending_ctx(const struct intel_execution_ring *e)
  static void test_close_pending(const struct intel_execution_ring *e)
  {
-	int fd = gem_reopen_driver(device);
+	int fd = drm_reopen_driver(device);
  	assert_reset_status(fd, fd, 0, RS_NO_ERROR);
@@ -588,7 +588,7 @@ static void noop_on_each_ring(int fd, const bool reverse)
  static void test_close_pending_fork(const struct intel_execution_ring *e,
  				    const bool reverse)
  {
-	int fd = gem_reopen_driver(device);
+	int fd = drm_reopen_driver(device);
  	igt_hang_t hang;
  	int pid;
@@ -603,7 +603,7 @@ static void test_close_pending_fork(const struct intel_execution_ring *e,
  	 */
  	pid = fork();
  	if (pid == 0) {
-		const int fd2 = gem_reopen_driver(device);
+		const int fd2 = drm_reopen_driver(device);
  		igt_assert_lte(0, fd2);
  		/* The crucial component is that we schedule the same noop batch
@@ -630,7 +630,7 @@ static void test_close_pending_fork(const struct intel_execution_ring *e,
  static void test_reset_count(const struct intel_execution_ring *e,
  			     const bool create_ctx)
  {
-	int fd = gem_reopen_driver(device);
+	int fd = drm_reopen_driver(device);
  	int ctx;
  	long c1, c2;
@@ -733,7 +733,7 @@ static void test_params_ctx(void)
  {
  	int fd;
-	fd = gem_reopen_driver(device);
+	fd = drm_reopen_driver(device);
  	_test_param(fd, gem_context_create(fd));
  	close(fd);
  }
@@ -742,7 +742,7 @@ static void test_params(void)
  {
  	int fd;
-	fd = gem_reopen_driver(device);
+	fd = drm_reopen_driver(device);
  	_test_param(fd, 0);
  	close(fd);
  }
@@ -767,7 +767,7 @@ static void defer_hangcheck(const struct intel_execution_ring *engine)
  	int fd, count_start, count_end;
  	int seconds = 30;
-	fd = gem_reopen_driver(device);
+	fd = drm_reopen_driver(device);
  	next = next_engine(fd, engine);
  	igt_skip_on(next == engine);
tests/i915/gem_ringfill.c +1 -1
index afcd7b73..de6e26bf 100644
@@ -219,7 +219,7 @@ static void run_test(int fd, const intel_ctx_t *ctx, unsigned ring,
  		igt_fork(child, nchild) {
  			const intel_ctx_t *child_ctx = NULL;
  			if (flags & NEWFD) {
-				fd = gem_reopen_driver(fd);
+				fd = drm_reopen_driver(fd);
  				child_ctx = intel_ctx_create(fd, &ctx->cfg);
  				setup_execbuf(fd, child_ctx, &execbuf, obj, reloc, ring);
tests/i915/gem_softpin.c +1 -1
index 8717860b..933daa4a 100644
@@ -1160,7 +1160,7 @@ static void *thread(void *data)
  	uint32_t batch = MI_BATCH_BUFFER_END;
  	int fd, ret, succeeded = 0;
-	fd = gem_reopen_driver(t->fd);
+	fd = drm_reopen_driver(t->fd);
  	ctx = intel_ctx_create(fd, &t->ctx->cfg);
  	offset_obj = gem_detect_safe_start_offset(fd);
  	offset_bb = ALIGN(offset_obj + 4096, gem_detect_safe_alignment(fd));
tests/i915/gem_userptr_blits.c +1 -1
index b00afc32..baba7cf3 100644
@@ -669,7 +669,7 @@ static void test_nohangcheck_hostile(int i915)
  	 * Even if the user disables hangcheck, we must still recover.
  	 */
-	i915 = gem_reopen_driver(i915);
+	i915 = drm_reopen_driver(i915);
  	gem_require_contexts(i915);
  	dir = igt_params_open(i915);
tests/i915/gem_vm_create.c +1 -1
index f47d8c55..44958cce 100644
@@ -306,7 +306,7 @@ static void isolation(int i915)
  	struct drm_i915_gem_context_param arg = {
  		.param = I915_CONTEXT_PARAM_VM,
  	};
-	int other = gem_reopen_driver(i915);
+	int other = drm_reopen_driver(i915);
  	uint32_t ctx[2], vm[2], result;
  	int loops = 4096;
tests/i915/gem_watchdog.c +1 -1
index 27f3a2d7..47ccd2ca 100644
@@ -564,7 +564,7 @@ igt_main
  					timeout * 1000);
  		default_timeout_wait_s = timeout * 5;
-		i915 = gem_reopen_driver(i915); /* Apply modparam. */
+		i915 = drm_reopen_driver(i915); /* Apply modparam. */
  		ctx = intel_ctx_create_all_physical(i915);
  	}
tests/i915/gem_workarounds.c +1 -1
index 7d119962..ae544adb 100644
@@ -198,7 +198,7 @@ static void check_workarounds(int fd, enum operation op, unsigned int flags)
  	const intel_ctx_t *ctx;
  	if (flags & FD)
-		fd = gem_reopen_driver(fd);
+		fd = drm_reopen_driver(fd);
  	ctx = intel_ctx_0(fd);
  	if (flags & CONTEXT) {
tests/i915/i915_suspend.c +1 -1
index a9507964..5b289ecb 100644
@@ -178,7 +178,7 @@ test_shrink(int fd, unsigned int mode)
  	gem_quiescent_gpu(fd);
  	igt_multi_fork(child, 1) {
-		fd = gem_reopen_driver(fd);
+		fd = drm_reopen_driver(fd);
  		igt_purge_vm_caches(fd);
  		mem = igt_get_total_pinnable_mem(&size);
tests/i915/perf.c +1 -1
index 9ca4d34b..cd73b1a9 100644
@@ -4513,7 +4513,7 @@ gen12_test_single_ctx_render_target_writes_a_counter(const struct intel_executio
  	do {
  		igt_fork_helper(&child) {
  			/* A local device for local resources. */
-			drm_fd = gem_reopen_driver(drm_fd);
+			drm_fd = drm_reopen_driver(drm_fd);
  			igt_drop_root();
  			gen12_single_ctx_helper(e);
#3 lore raw

[igt-dev] ✓ Fi.CI.BAT: success for lib/i915: Move gem_reopen_driver() out to lib

In reply to Anna Karas
== Series Details ==

== Series Details ==

Series: lib/i915: Move gem_reopen_driver() out to lib
URL : https://patchwork.freedesktop.org/series/117068/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_13071 -> IGTPW_8878
====================================================

Summary
-------

**SUCCESS**

No regressions found.

External URL: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8878/index.html

Participating hosts (38 -> 35)
------------------------------

Missing (3): bat-mtlp-8 fi-snb-2520m bat-mtlp-6

Known issues
------------

Here are the changes found in IGTPW_8878 that come from known issues:

### IGT changes ###

#### Issues hit ####

* igt@i915_selftest@live@gt_heartbeat:
- fi-apl-guc: [PASS][1] -> [FAIL][2] ([i915#7916])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13071/fi-apl-guc/igt@i915_selftest@live@gt_heartbeat.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8878/fi-apl-guc/igt@i915_selftest@live@gt_heartbeat.html

* igt@i915_selftest@live@gt_lrc:
- bat-dg2-11: [PASS][3] -> [INCOMPLETE][4] ([i915#7609] / [i915#7913])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13071/bat-dg2-11/igt@i915_selftest@live@gt_lrc.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8878/bat-dg2-11/igt@i915_selftest@live@gt_lrc.html

* igt@kms_chamelium_hpd@common-hpd-after-suspend:
- bat-rpls-1: NOTRUN -> [SKIP][5] ([i915#7828])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8878/bat-rpls-1/igt@[email protected]

* igt@kms_pipe_crc_basic@suspend-read-crc:
- bat-rpls-1: NOTRUN -> [SKIP][6] ([i915#1845])
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8878/bat-rpls-1/igt@[email protected]

#### Possible fixes ####

* igt@gem_exec_suspend@basic-s3@smem:
- bat-rpls-1: [ABORT][7] ([i915#6687]) -> [PASS][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13071/bat-rpls-1/igt@gem_exec_suspend@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8878/bat-rpls-1/igt@gem_exec_suspend@[email protected]

* igt@i915_selftest@live@gt_heartbeat:
- fi-glk-j4005: [FAIL][9] ([i915#7916]) -> [PASS][10]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13071/fi-glk-j4005/igt@i915_selftest@live@gt_heartbeat.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8878/fi-glk-j4005/igt@i915_selftest@live@gt_heartbeat.html

* igt@i915_selftest@live@slpc:
- bat-rpls-1: [FAIL][11] ([i915#6997]) -> [PASS][12]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13071/bat-rpls-1/igt@i915_selftest@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8878/bat-rpls-1/igt@i915_selftest@[email protected]

#### Warnings ####

* igt@core_hotunplug@unbind-rebind:
- fi-kbl-8809g: [ABORT][13] -> [ABORT][14] ([i915#8397])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13071/fi-kbl-8809g/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8878/fi-kbl-8809g/igt@[email protected]

* igt@i915_suspend@basic-s3-without-i915:
- fi-tgl-1115g4: [INCOMPLETE][15] ([i915#7443] / [i915#8102]) -> [INCOMPLETE][16] ([i915#8102])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13071/fi-tgl-1115g4/igt@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8878/fi-tgl-1115g4/igt@[email protected]

[i915#1845]: https://gitlab.freedesktop.org/drm/intel/issues/1845
[i915#6687]: https://gitlab.freedesktop.org/drm/intel/issues/6687
[i915#6997]: https://gitlab.freedesktop.org/drm/intel/issues/6997
[i915#7443]: https://gitlab.freedesktop.org/drm/intel/issues/7443
[i915#7609]: https://gitlab.freedesktop.org/drm/intel/issues/7609
[i915#7828]: https://gitlab.freedesktop.org/drm/intel/issues/7828
[i915#7913]: https://gitlab.freedesktop.org/drm/intel/issues/7913
[i915#7916]: https://gitlab.freedesktop.org/drm/intel/issues/7916
[i915#8102]: https://gitlab.freedesktop.org/drm/intel/issues/8102
[i915#8397]: https://gitlab.freedesktop.org/drm/intel/issues/8397

Build changes
-------------

* CI: CI-20190529 -> None
* IGT: IGT_7273 -> IGTPW_8878

CI-20190529: 20190529
CI_DRM_13071: b9458e7075652669ec0e04abe039a5ed001701fe @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_8878: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8878/index.html
IGT_7273: f40ef4b058466219968b7792d22ff0648b82396b @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git

Testlist changes
----------------

-igt@kms_rotation_crc@primary-reflect-x -igt@kms_rotation_crc@primary-reflect-y -igt@kms_rotation_crc@sprite-reflect-x -igt@kms_rotation_crc@sprite-reflect-y -igt@kms_rotation_crc@sprite-rotation-90-pos-0-100 -igt@kms_rotation_crc@sprite-rotation-90-pos-100-100 -igt@kms_rotation_crc@sprite-rotation-180-pos-0-100 -igt@kms_rotation_crc@sprite-rotation-180-pos-100-0 -igt@kms_rotation_crc@sprite-rotation-180-pos-100-100 -igt@kms_rotation_crc@sprite-rotation-270-pos-0-100 -igt@kms_rotation_crc@sprite-rotation-270-pos-100-0 -igt@kms_rotation_crc@sprite-rotation-270-pos-100-100

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8878/index.html

#4 lore raw

[igt-dev] ✓ Fi.CI.IGT: success for lib/i915: Move gem_reopen_driver() out to lib

In reply to Anna Karas
== Series Details ==

== Series Details ==

Series: lib/i915: Move gem_reopen_driver() out to lib
URL : https://patchwork.freedesktop.org/series/117068/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_13071_full -> IGTPW_8878_full
====================================================

Summary
-------

**SUCCESS**

No regressions found.

External URL: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8878/index.html

Participating hosts (7 -> 7)
------------------------------

No changes in participating hosts

Possible new issues
-------------------

Here are the unknown changes that may have been introduced in IGTPW_8878_full:

### IGT changes ###

#### Suppressed ####

The following results come from untrusted machines, tests, or statuses. They do not affect the overall result.

* igt@gem_exec_suspend@basic-s4-devices@smem:
- {shard-tglu}: [PASS][1] -> [ABORT][2] +1 similar issue
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13071/shard-tglu-7/igt@gem_exec_suspend@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8878/shard-tglu-10/igt@gem_exec_suspend@[email protected]

Known issues
------------

Here are the changes found in IGTPW_8878_full that come from known issues:

### IGT changes ###

#### Issues hit ####

* igt@gem_barrier_race@remote-request@rcs0:
- shard-glk: [PASS][3] -> [ABORT][4] ([i915#7461])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13071/shard-glk2/igt@gem_barrier_race@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8878/shard-glk7/igt@gem_barrier_race@[email protected]

* igt@gem_exec_fair@basic-pace@vcs0:
- shard-glk: [PASS][5] -> [FAIL][6] ([i915#2842]) +2 similar issues
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13071/shard-glk9/igt@gem_exec_fair@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8878/shard-glk4/igt@gem_exec_fair@[email protected]

* igt@gem_huc_copy@huc-copy:
- shard-apl: NOTRUN -> [SKIP][7] ([fdo#109271] / [i915#2190])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8878/shard-apl6/igt@[email protected]

* igt@kms_big_fb@4-tiled-max-hw-stride-32bpp-rotate-180-hflip-async-flip:
- shard-apl: NOTRUN -> [SKIP][8] ([fdo#109271]) +25 similar issues
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8878/shard-apl1/igt@kms_big_fb@4-tiled-max-hw-stride-32bpp-rotate-180-hflip-async-flip.html

* igt@kms_cdclk@mode-transition:
- shard-glk: NOTRUN -> [SKIP][9] ([fdo#109271]) +6 similar issues
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8878/shard-glk9/igt@[email protected]

* igt@kms_content_protection@atomic@pipe-a-dp-1:
- shard-apl: NOTRUN -> [TIMEOUT][10] ([i915#7173])
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8878/shard-apl3/igt@kms_content_protection@[email protected]

* igt@kms_plane_scaling@plane-upscale-with-modifiers-factor-0-25@pipe-a-vga-1:
- shard-snb: NOTRUN -> [SKIP][11] ([fdo#109271]) +23 similar issues
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8878/shard-snb6/igt@kms_plane_scaling@[email protected]

* igt@kms_psr2_sf@overlay-plane-move-continuous-sf:
- shard-glk: NOTRUN -> [SKIP][12] ([fdo#109271] / [i915#658])
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8878/shard-glk4/igt@[email protected]

#### Possible fixes ####

* igt@drm_fdinfo@most-busy-idle-check-all@rcs0:
- {shard-rkl}: [FAIL][13] ([i915#7742]) -> [PASS][14]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13071/shard-rkl-6/igt@drm_fdinfo@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8878/shard-rkl-2/igt@drm_fdinfo@[email protected]

* igt@gem_barrier_race@remote-request@rcs0:
- {shard-dg1}: [ABORT][15] ([i915#7461] / [i915#8234]) -> [PASS][16]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13071/shard-dg1-16/igt@gem_barrier_race@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8878/shard-dg1-12/igt@gem_barrier_race@[email protected]

* igt@gem_ctx_exec@basic-nohangcheck:
- {shard-rkl}: [FAIL][17] ([i915#6268]) -> [PASS][18]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13071/shard-rkl-1/igt@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8878/shard-rkl-3/igt@[email protected]
- {shard-tglu}: [FAIL][19] ([i915#6268]) -> [PASS][20]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13071/shard-tglu-5/igt@[email protected]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8878/shard-tglu-8/igt@[email protected]

* igt@gem_eio@hibernate:
- shard-apl: [ABORT][21] -> [PASS][22]
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13071/shard-apl3/igt@[email protected]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8878/shard-apl1/igt@[email protected]

* igt@gem_exec_fair@basic-deadline:
- {shard-rkl}: [FAIL][23] ([i915#2846]) -> [PASS][24]
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13071/shard-rkl-7/igt@[email protected]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8878/shard-rkl-3/igt@[email protected]

* igt@gem_exec_fair@basic-pace-share@rcs0:
- shard-glk: [FAIL][25] ([i915#2842]) -> [PASS][26]
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13071/shard-glk2/igt@gem_exec_fair@[email protected]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8878/shard-glk6/igt@gem_exec_fair@[email protected]

* igt@gem_exec_fair@basic-pace@rcs0:
- {shard-rkl}: [FAIL][27] ([i915#2842]) -> [PASS][28] +1 similar issue
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13071/shard-rkl-7/igt@gem_exec_fair@[email protected]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8878/shard-rkl-7/igt@gem_exec_fair@[email protected]

* igt@i915_pm_lpsp@kms-lpsp@kms-lpsp-hdmi-a:
- {shard-rkl}: [SKIP][29] ([i915#1937]) -> [PASS][30]
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13071/shard-rkl-6/igt@i915_pm_lpsp@[email protected]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8878/shard-rkl-7/igt@i915_pm_lpsp@[email protected]

* igt@i915_pm_rc6_residency@rc6-idle@vcs0:
- {shard-dg1}: [FAIL][31] ([i915#3591]) -> [PASS][32]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13071/shard-dg1-14/igt@i915_pm_rc6_residency@[email protected]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8878/shard-dg1-18/igt@i915_pm_rc6_residency@[email protected]

* igt@i915_pm_rpm@modeset-lpsp-stress:
- {shard-rkl}: [SKIP][33] ([i915#1397]) -> [PASS][34] +1 similar issue
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13071/shard-rkl-2/igt@[email protected]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8878/shard-rkl-7/igt@[email protected]

* igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions:
- shard-glk: [FAIL][35] ([i915#2346]) -> [PASS][36]
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13071/shard-glk6/igt@[email protected]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8878/shard-glk9/igt@[email protected]

* igt@kms_plane@pixel-format@pipe-a-planes:
- shard-glk: [FAIL][37] ([i915#1623]) -> [PASS][38]
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13071/shard-glk9/igt@kms_plane@[email protected]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8878/shard-glk8/igt@kms_plane@[email protected]

* igt@kms_vblank@pipe-a-ts-continuation-suspend:
- {shard-tglu}: [ABORT][39] ([i915#5122]) -> [PASS][40]
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13071/shard-tglu-5/igt@[email protected]
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8878/shard-tglu-2/igt@[email protected]

* igt@perf_pmu@idle@rcs0:
- {shard-rkl}: [FAIL][41] ([i915#4349]) -> [PASS][42]
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13071/shard-rkl-6/igt@perf_pmu@[email protected]
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8878/shard-rkl-6/igt@perf_pmu@[email protected]

{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).

[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109280]: https://bugs.freedesktop.org/show_bug.cgi?id=109280
[fdo#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285
[fdo#109289]: https://bugs.freedesktop.org/show_bug.cgi?id=109289
[fdo#109295]: https://bugs.freedesktop.org/show_bug.cgi?id=109295
[fdo#109309]: https://bugs.freedesktop.org/show_bug.cgi?id=109309
[fdo#109315]: https://bugs.freedesktop.org/show_bug.cgi?id=109315
[fdo#110189]: https://bugs.freedesktop.org/show_bug.cgi?id=110189
[fdo#110723]: https://bugs.freedesktop.org/show_bug.cgi?id=110723
[fdo#111615]: https://bugs.freedesktop.org/show_bug.cgi?id=111615
[fdo#111825]: https://bugs.freedesktop.org/show_bug.cgi?id=111825
[i915#1072]: https://gitlab.freedesktop.org/drm/intel/issues/1072
[i915#1397]: https://gitlab.freedesktop.org/drm/intel/issues/1397
[i915#1623]: https://gitlab.freedesktop.org/drm/intel/issues/1623
[i915#1825]: https://gitlab.freedesktop.org/drm/intel/issues/1825
[i915#1839]: https://gitlab.freedesktop.org/drm/intel/issues/1839
[i915#1937]: https://gitlab.freedesktop.org/drm/intel/issues/1937
[i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190
[i915#2346]: https://gitlab.freedesktop.org/drm/intel/issues/2346
[i915#2437]: https://gitlab.freedesktop.org/drm/intel/issues/2437
[i915#2527]: https://gitlab.freedesktop.org/drm/intel/issues/2527
[i915#2575]: https://gitlab.freedesktop.org/drm/intel/issues/2575
[i915#2587]: https://gitlab.freedesktop.org/drm/intel/issues/2587
[i915#2672]: https://gitlab.freedesktop.org/drm/intel/issues/2672
[i915#280]: https://gitlab.freedesktop.org/drm/intel/issues/280
[i915#2842]: https://gitlab.freedesktop.org/drm/intel/issues/2842
[i915#2846]: https://gitlab.freedesktop.org/drm/intel/issues/2846
[i915#3023]: https://gitlab.freedesktop.org/drm/intel/issues/3023
[i915#3116]: https://gitlab.freedesktop.org/drm/intel/issues/3116
[i915#315]: https://gitlab.freedesktop.org/drm/intel/issues/315
[i915#3281]: https://gitlab.freedesktop.org/drm/intel/issues/3281
[i915#3282]: https://gitlab.freedesktop.org/drm/intel/issues/3282
[i915#3297]: https://gitlab.freedesktop.org/drm/intel/issues/3297
[i915#3359]: https://gitlab.freedesktop.org/drm/intel/issues/3359
[i915#3458]: https://gitlab.freedesktop.org/drm/intel/issues/3458
[i915#3539]: https://gitlab.freedesktop.org/drm/intel/issues/3539
[i915#3555]: https://gitlab.freedesktop.org/drm/intel/issues/3555
[i915#3591]: https://gitlab.freedesktop.org/drm/intel/issues/3591
[i915#3689]: https://gitlab.freedesktop.org/drm/intel/issues/3689
[i915#3708]: https://gitlab.freedesktop.org/drm/intel/issues/3708
[i915#3734]: https://gitlab.freedesktop.org/drm/intel/issues/3734
[i915#3886]: https://gitlab.freedesktop.org/drm/intel/issues/3886
[i915#3955]: https://gitlab.freedesktop.org/drm/intel/issues/3955
[i915#4070]: https://gitlab.freedesktop.org/drm/intel/issues/4070
[i915#4077]: https://gitlab.freedesktop.org/drm/intel/issues/4077
[i915#4078]: https://gitlab.freedesktop.org/drm/intel/issues/4078
[i915#4083]: https://gitlab.freedesktop.org/drm/intel/issues/4083
[i915#4098]: https://gitlab.freedesktop.org/drm/intel/issues/4098
[i915#4103]: https://gitlab.freedesktop.org/drm/intel/issues/4103
[i915#4349]: https://gitlab.freedesktop.org/drm/intel/issues/4349
[i915#4538]: https://gitlab.freedesktop.org/drm/intel/issues/4538
[i915#4579]: https://gitlab.freedesktop.org/drm/intel/issues/4579
[i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
[i915#4816]: https://gitlab.freedesktop.org/drm/intel/issues/4816
[i915#4833]: https://gitlab.freedesktop.org/drm/intel/issues/4833
[i915#4860]: https://gitlab.freedesktop.org/drm/intel/issues/4860
[i915#5122]: https://gitlab.freedesktop.org/drm/intel/issues/5122
[i915#5176]: https://gitlab.freedesktop.org/drm/intel/issues/5176
[i915#5235]: https://gitlab.freedesktop.org/drm/intel/issues/5235
[i915#5286]: https://gitlab.freedesktop.org/drm/intel/issues/5286
[i915#5354]: https://gitlab.freedesktop.org/drm/intel/issues/5354
[i915#5784]: https://gitlab.freedesktop.org/drm/intel/issues/5784
[i915#6095]: https://gitlab.freedesktop.org/drm/intel/issues/6095
[i915#6268]: https://gitlab.freedesktop.org/drm/intel/issues/6268
[i915#6433]: https://gitlab.freedesktop.org/drm/intel/issues/6433
[i915#658]: https://gitlab.freedesktop.org/drm/intel/issues/658
[i915#6768]: https://gitlab.freedesktop.org/drm/intel/issues/6768
[i915#6944]: https://gitlab.freedesktop.org/drm/intel/issues/6944
[i915#7116]: https://gitlab.freedesktop.org/drm/intel/issues/7116
[i915#7118]: https://gitlab.freedesktop.org/drm/intel/issues/7118
[i915#7173]: https://gitlab.freedesktop.org/drm/intel/issues/7173
[i915#7443]: https://gitlab.freedesktop.org/drm/intel/issues/7443
[i915#7456]: https://gitlab.freedesktop.org/drm/intel/issues/7456
[i915#7461]: https://gitlab.freedesktop.org/drm/intel/issues/7461
[i915#7711]: https://gitlab.freedesktop.org/drm/intel/issues/7711
[i915#7742]: https://gitlab.freedesktop.org/drm/intel/issues/7742
[i915#7828]: https://gitlab.freedesktop.org/drm/intel/issues/7828
[i915#7967]: https://gitlab.freedesktop.org/drm/intel/issues/7967
[i915#8102]: https://gitlab.freedesktop.org/drm/intel/issues/8102
[i915#8234]: https://gitlab.freedesktop.org/drm/intel/issues/8234
[i915#8292]: https://gitlab.freedesktop.org/drm/intel/issues/8292
[i915#8381]: https://gitlab.freedesktop.org/drm/intel/issues/8381
[i915#8399]: https://gitlab.freedesktop.org/drm/intel/issues/8399

Build changes
-------------

* CI: CI-20190529 -> None
* IGT: IGT_7273 -> IGTPW_8878
* Piglit: piglit_4509 -> None

CI-20190529: 20190529
CI_DRM_13071: b9458e7075652669ec0e04abe039a5ed001701fe @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_8878: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8878/index.html
IGT_7273: f40ef4b058466219968b7792d22ff0648b82396b @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8878/index.html

#5 lore raw
In reply to Anna Karas

Hi Anna,

please change description into:

lib/drmtest: Add function drm_reopen_driver()

Quoted 60 lines · Anna Karas

We need an equivalent of gem_reopen_driver() in XE. In order to not duplicate the code, move gem_reopen_driver() one directory up from lib/i915 to lib as drm_reopen_driver() so XE can use it too.

Rename gem_reopen_driver() across files.

---
 lib/drmtest.c                    | 18 ++++++++++++++++++
 lib/drmtest.h                    |  2 ++
 lib/i915/gem.c                   | 20 +-------------------
 lib/i915/gem.h                   |  2 --
 lib/i915/gem_ring.c              |  2 +-
 lib/i915/gem_submission.c        |  4 ++--
 tests/i915/api_intel_allocator.c |  6 +++---
 tests/i915/drm_fdinfo.c          |  2 +-
 tests/i915/gem_barrier_race.c    |  2 +-
 tests/i915/gem_close_race.c      |  4 ++--
 tests/i915/gem_concurrent_all.c  |  2 +-
 tests/i915/gem_ctx_create.c      |  2 +-
 tests/i915/gem_ctx_exec.c        |  2 +-
 tests/i915/gem_ctx_param.c       |  3 +--
 tests/i915/gem_ctx_persistence.c | 12 ++++++------
 tests/i915/gem_ctx_shared.c      |  2 +-
 tests/i915/gem_eio.c             |  2 +-
 tests/i915/gem_exec_alignment.c  |  6 +++---
 tests/i915/gem_exec_capture.c    |  2 +-
 tests/i915/gem_exec_fair.c       |  2 +-
 tests/i915/gem_exec_fence.c      |  2 +-
 tests/i915/gem_exec_nop.c        |  2 +-
 tests/i915/gem_exec_parallel.c   |  2 +-
 tests/i915/gem_exec_whisper.c    |  4 ++--
 tests/i915/gem_lmem_evict.c      |  2 +-
 tests/i915/gem_lmem_swapping.c   |  6 +++---
 tests/i915/gem_mmap_gtt.c        |  7 +++----
 tests/i915/gem_mmap_offset.c     |  9 ++++-----
 tests/i915/gem_reset_stats.c     | 30 +++++++++++++++---------------
 tests/i915/gem_ringfill.c        |  2 +-
 tests/i915/gem_softpin.c         |  2 +-
 tests/i915/gem_userptr_blits.c   |  2 +-
 tests/i915/gem_vm_create.c       |  2 +-
 tests/i915/gem_watchdog.c        |  2 +-
 tests/i915/gem_workarounds.c     |  2 +-
 tests/i915/i915_suspend.c        |  2 +-
 tests/i915/perf.c                |  2 +-
 37 files changed, 87 insertions(+), 90 deletions(-)
lib/drmtest.c +5 -0
index c91a9142..72eae7af 100644
@@ -652,6 +652,24 @@ int drm_open_driver_render(int chipset)
 	return fd;
 }
 
+/**
+ * drm_reopen_driver:
+ * @fd: re-open the drm file descriptor
+ *
+ * Re-opens the drm fd which is useful in instances where a clean default

lib/drmtest.c int drm_open_driver_render(int chipset) · line 669

Quoted 10 lines
lib/drmtest.c +10 -0
+ * context is needed.
+ */
+int drm_reopen_driver(int fd)
+{
+	char path[256];
+
+	snprintf(path, sizeof(path), "/proc/self/fd/%d", fd);
+	fd = open(path, O_RDWR);
+	igt_assert_fd(fd);
+

Please look also at patch from Bhanuprakash Modem
https://patchwork.freedesktop.org/patch/535285/?series=117263&rev=3
[i-g-t 2/6] lib: Cache xe_device at driver open/close level

and add here

	if (is_xe_device(fd))
		xe_device_get(fd);

Regards,
Kamil

Quoted 797 lines
lib/drmtest.c +3 -0
+	return fd;
+}
+
 void igt_require_amdgpu(int fd)
 {
 	igt_require(is_amdgpu_device(fd));
lib/drmtest.h +2 -0
index 5878f651..9b7a81b6 100644
@@ -98,6 +98,8 @@ int __drm_open_driver_another(int idx, int chipset);
 int __drm_open_driver(int chipset);
 int __drm_open_driver_render(int chipset);
 
+int drm_reopen_driver(int fd);
+
 void igt_require_amdgpu(int fd);
 void igt_require_intel(int fd);
 void igt_require_i915(int fd);
lib/i915/gem.c +1 -19
index ed45a9ed..6da3e5c9 100644
@@ -147,7 +147,7 @@ void igt_require_gem(int i915)
 	 * of a wedged device, not for actually waiting on outstanding
 	 * requests! So create a new drm_file for the device that is clean.
 	 */
-	i915 = gem_reopen_driver(i915);
+	i915 = drm_reopen_driver(i915);
 
 	/*
 	 * Reset the global seqno at the start of each test. This ensures that
@@ -189,21 +189,3 @@ void gem_quiescent_gpu(int i915)
 	igt_drop_caches_set(i915,
 			    DROP_ACTIVE | DROP_RETIRE | DROP_IDLE | DROP_FREED);
 }
-
-/**
- * gem_reopen_driver:
- * @i915: re-open the i915 drm file descriptor
- *
- * Re-opens the drm fd which is useful in instances where a clean default
- * context is needed.
- */
-int gem_reopen_driver(int i915)
-{
-	char path[256];
-
-	snprintf(path, sizeof(path), "/proc/self/fd/%d", i915);
-	i915 = open(path, O_RDWR);
-	igt_assert_fd(i915);
-
-	return i915;
-}
lib/i915/gem.h +0 -2
index feabac8d..06dcb546 100644
@@ -30,6 +30,4 @@
 void igt_require_gem(int i915);
 void gem_quiescent_gpu(int i915);
 
-int gem_reopen_driver(int i915);
-
 #endif /* I915_GEM_H */
lib/i915/gem_ring.c +1 -1
index 6d28b5d9..eb2c7c2c 100644
@@ -149,7 +149,7 @@ gem_measure_ring_inflight(int fd, unsigned int engine, enum measure_ring_flags f
 {
 	unsigned int min = ~0u;
 
-	fd = gem_reopen_driver(fd);
+	fd = drm_reopen_driver(fd);
 
 	/* When available, disable execbuf throttling */
 	fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | O_NONBLOCK);
lib/i915/gem_submission.c +2 -2
index 0358802e..adf5eb39 100644
@@ -30,7 +30,6 @@
 
 #include <i915_drm.h>
 
-#include "i915/gem.h"
 #include "i915/gem_create.h"
 #include "i915/gem_engine_topology.h"
 #include "i915/gem_submission.h"
@@ -42,6 +41,7 @@
 #include "intel_chipset.h"
 #include "intel_reg.h"
 #include "ioctl_wrappers.h"
+#include "drmtest.h"
 
 /**
  * SECTION:gem_submission
@@ -158,7 +158,7 @@ void gem_test_all_engines(int i915)
 	};
 	const intel_ctx_t *ctx;
 
-	i915 = gem_reopen_driver(i915);
+	i915 = drm_reopen_driver(i915);
 	igt_assert(!is_wedged(i915));
 
 	ctx = intel_ctx_create_all_physical(i915);
tests/i915/api_intel_allocator.c +3 -3
index e9039a21..1263e0fb 100644
@@ -498,7 +498,7 @@ static void reopen(int fd)
 
 	igt_require_gem(fd);
 
-	fd2 = gem_reopen_driver(fd);
+	fd2 = drm_reopen_driver(fd);
 
 	__reopen_allocs(fd, fd2, true);
 
@@ -514,7 +514,7 @@ static void reopen_fork(int fd)
 
 	intel_allocator_multiprocess_start();
 
-	fd2 = gem_reopen_driver(fd);
+	fd2 = drm_reopen_driver(fd);
 
 	igt_fork(child, 2) {
 		igt_until_timeout(REOPEN_TIMEOUT)
@@ -681,7 +681,7 @@ static void fork_reopen_allocator(int fd, uint8_t type)
 		igt_assert(!intel_allocator_is_allocated(ctx_ahnd, 1, 123, offset));
 		intel_allocator_alloc(ctx_ahnd, 2, 123, 0);
 
-		fd = gem_reopen_driver(fd);
+		fd = drm_reopen_driver(fd);
 		fd_ahnd = intel_allocator_open(fd, 0, type);
 		igt_assert(!intel_allocator_is_allocated(fd_ahnd, 1, 123, offset));
 		intel_allocator_alloc(fd_ahnd, 2, 123, 0);
tests/i915/drm_fdinfo.c +1 -1
index 1b124755..ac668c29 100644
@@ -201,7 +201,7 @@ single(int gem_fd, const intel_ctx_t *ctx,
 		igt_require(!gem_using_guc_submission(gem_fd));
 
 	if (flags & TEST_ISOLATION) {
-		spin_fd = gem_reopen_driver(gem_fd);
+		spin_fd = drm_reopen_driver(gem_fd);
 		ctx = intel_ctx_create_all_physical(spin_fd);
 	} else {
 		spin_fd = gem_fd;
tests/i915/gem_barrier_race.c +1 -1
index f446aab6..faeec361 100644
@@ -95,7 +95,7 @@ static void intel_context_first_pin_last_unpin_loop(int fd, uint64_t engine, int
 	 */
 	const uint32_t batch[2] = { 0, MI_BATCH_BUFFER_END };
 
-	fd = gem_reopen_driver(fd);
+	fd = drm_reopen_driver(fd);
 
 	do {
 		uint32_t handle = gem_create(fd, 4096);
tests/i915/gem_close_race.c +2 -2
index 9c646f42..dc88eca4 100644
@@ -170,7 +170,7 @@ static void process(int fd, int child)
 {
 	uint32_t handle;
 
-	fd = gem_reopen_driver(fd);
+	fd = drm_reopen_driver(fd);
 
 	handle = load(fd);
 	if ((child & 63) == 63)
@@ -220,7 +220,7 @@ static void thread(int fd, struct drm_gem_open name,
 
 		memset(history, 0, sizeof(*history) * N_HISTORY);
 
-		crashme.fd = gem_reopen_driver(fd);
+		crashme.fd = drm_reopen_driver(fd);
 
 		memset(&its, 0, sizeof(its));
 		its.it_value.tv_nsec = msec(1) + (rand() % msec(150));
tests/i915/gem_concurrent_all.c +1 -1
index 25b7daf8..fb3b5f5d 100644
@@ -1465,7 +1465,7 @@ static void __run_forked(struct buffers *buffers,
 		int num_buffers;
 
 		/* recreate process local variables */
-		fd = gem_reopen_driver(fd);
+		fd = drm_reopen_driver(fd);
 
 		intel_allocator_init(); /* detach from thread */
 		num_buffers = buffers->num_buffers / num_children;
tests/i915/gem_ctx_create.c +1 -1
index 39f070af..a59abd08 100644
@@ -106,7 +106,7 @@ static void files(int core, const intel_ctx_cfg_t *cfg,
 
 		clock_gettime(CLOCK_MONOTONIC, &start);
 		do {
-			fd = gem_reopen_driver(core);
+			fd = drm_reopen_driver(core);
 
 			ctx = intel_ctx_create(fd, cfg);
 			execbuf.rsvd1 = ctx->id;
tests/i915/gem_ctx_exec.c +1 -1
index 3d94f01d..20fa1159 100644
@@ -282,7 +282,7 @@ static void nohangcheck_hostile(int i915)
 	 * we forcibly terminate that context.
 	 */
 
-	i915 = gem_reopen_driver(i915);
+	i915 = drm_reopen_driver(i915);
 
 	dir = igt_params_open(i915);
 	igt_require(dir != -1);
tests/i915/gem_ctx_param.c +1 -2
index d119ea74..2526b09c 100644
@@ -28,7 +28,6 @@
 #include <limits.h>
 
 #include "igt.h"
-#include "i915/gem.h"
 #include "i915/gem_create.h"
 #include "i915/gem_vm.h"
 
@@ -81,7 +80,7 @@ static void set_priority(int i915)
 	igt_permute_array(values, size, igt_exchange_int64);
 
 	igt_fork(flags, NEW_CTX | USER) {
-		int fd = gem_reopen_driver(i915);
+		int fd = drm_reopen_driver(i915);
 		struct drm_i915_gem_context_param arg = {
 			.param = I915_CONTEXT_PARAM_PRIORITY,
 			.ctx_id = flags & NEW_CTX ? gem_context_create(fd) : 0,
tests/i915/gem_ctx_persistence.c +6 -6
index 9fb52818..c0197cea 100644
@@ -598,7 +598,7 @@ static void test_nonpersistent_file(int i915)
 	 * has been made nonpersistent, in which case it must be terminated.
 	 */
 
-	i915 = gem_reopen_driver(i915);
+	i915 = drm_reopen_driver(i915);
 
 	ahnd = get_reloc_ahnd(i915, 0);
 	gem_context_set_persistence(i915, 0, false);
@@ -742,7 +742,7 @@ static void test_process(int i915)
 		uint64_t ahnd;
 
 		intel_allocator_init();
-		i915 = gem_reopen_driver(i915);
+		i915 = drm_reopen_driver(i915);
 		gem_quiescent_gpu(i915);
 
 		gem_context_set_persistence(i915, 0, false);
@@ -790,7 +790,7 @@ static void test_userptr(int i915)
 		uint64_t ahnd;
 
 		intel_allocator_init();
-		i915 = gem_reopen_driver(i915);
+		i915 = drm_reopen_driver(i915);
 		gem_quiescent_gpu(i915);
 
 		gem_context_set_persistence(i915, 0, false);
@@ -833,7 +833,7 @@ static void test_process_mixed(int pfd, const intel_ctx_cfg_t *cfg,
 	igt_fork(child, 1) {
 		int i915;
 
-		i915 = gem_reopen_driver(pfd);
+		i915 = drm_reopen_driver(pfd);
 		gem_quiescent_gpu(i915);
 
 		for (int persists = 0; persists <= 1; persists++) {
@@ -1000,7 +1000,7 @@ static void test_processes(int i915)
 			uint64_t ahnd;
 
 			intel_allocator_init();
-			i915 = gem_reopen_driver(i915);
+			i915 = drm_reopen_driver(i915);
 			gem_context_set_persistence(i915, 0, i);
 
 			ahnd = get_reloc_ahnd(i915, 0);
@@ -1069,7 +1069,7 @@ static void __smoker(int i915, const intel_ctx_cfg_t *cfg,
 	const intel_ctx_t *ctx;
 	uint64_t ahnd;
 
-	fd = gem_reopen_driver(i915);
+	fd = drm_reopen_driver(i915);
 	ctx = ctx_create_persistence(fd, cfg, expected > 0);
 	ahnd = get_reloc_ahnd(fd, ctx->id);
 	spin = igt_spin_new(fd, .ahnd = ahnd, .ctx = ctx, .engine = engine,
tests/i915/gem_ctx_shared.c +1 -1
index 3d73db58..8629992e 100644
@@ -206,7 +206,7 @@ static void exhaust_shared_gtt(int i915, unsigned int flags)
 		},
 	};
 
-	i915 = gem_reopen_driver(i915);
+	i915 = drm_reopen_driver(i915);
 
 	vm_create_ext.param.value = gem_vm_create(i915);
 
tests/i915/gem_eio.c +1 -1
index 8dbaa7a7..81e55e16 100644
@@ -450,7 +450,7 @@ static void set_heartbeat(int i915, int interval)
 
 static int reopen_device(int i915)
 {
-	i915 = gem_reopen_driver(i915);
+	i915 = drm_reopen_driver(i915);
 	igt_require_gem(i915);
 	set_heartbeat(i915, 250); /* require gem restores defaults */
 
tests/i915/gem_exec_alignment.c +3 -3
index a9fcd2a7..5059572f 100644
@@ -158,7 +158,7 @@ naughty_child(int i915, int link, uint32_t shared, unsigned int flags)
 	uint64_t elapsed;
 
 	if (flags & ISOLATED)
-		i915 = gem_reopen_driver(i915);
+		i915 = drm_reopen_driver(i915);
 
 	if (!(flags & SHARED))
 		shared = 0;
@@ -449,7 +449,7 @@ static void forked(int i915, int timeout)
 	struct drm_i915_gem_exec_object2 *obj;
 	unsigned long count;
 
-	i915 = gem_reopen_driver(i915);
+	i915 = drm_reopen_driver(i915);
 	igt_require(gem_uses_full_ppgtt(i915));
 
 	obj = setup_many(i915, &count);
@@ -457,7 +457,7 @@ static void forked(int i915, int timeout)
 		obj[i].handle = gem_flink(i915, obj[i].handle);
 
 	igt_fork(child, sysconf(_SC_NPROCESSORS_ONLN)) {
-		i915 = gem_reopen_driver(i915);
+		i915 = drm_reopen_driver(i915);
 		for (unsigned long i = 0; i < count; i++)
 			obj[i].handle = gem_open(i915, obj[i].handle);
 		__many(i915, timeout, obj, count);
tests/i915/gem_exec_capture.c +1 -1
index 9c391192..5d3e0905 100644
@@ -714,7 +714,7 @@ static void prioinv(int fd, int dir, const intel_ctx_t *ctx,
 	igt_fork(child, 1) {
 		const intel_ctx_t *ctx2;
 		int fence_out;
-		fd = gem_reopen_driver(fd);
+		fd = drm_reopen_driver(fd);
 		igt_debug("Submitting large capture [%ld x %dMiB objects]\n",
 			  count, (int)(size >> 20));
 
tests/i915/gem_exec_fair.c +1 -1
index 8208ab40..67af4739 100644
@@ -728,7 +728,7 @@ static void fairness(int i915, const intel_ctx_cfg_t *cfg,
 				if (common)
 					dmabuf = prime_handle_to_fd(i915, common);
 
-				i915 = gem_reopen_driver(i915);
+				i915 = drm_reopen_driver(i915);
 
 				if (dmabuf != -1)
 					common = prime_fd_to_handle(i915, dmabuf);
tests/i915/gem_exec_fence.c +1 -1
index c2d874f8..70f86da5 100644
@@ -1655,7 +1655,7 @@ static void test_invalid_timeline_fence_array(int fd)
 	uint64_t value;
 	void *ptr;
 
-	fd = gem_reopen_driver(fd);
+	fd = drm_reopen_driver(fd);
 
 	/* create an otherwise valid execbuf */
 	memset(&obj, 0, sizeof(obj));
tests/i915/gem_exec_nop.c +1 -1
index 497f57f0..f1ec23e8 100644
@@ -608,7 +608,7 @@ static void multiple(int fd, const intel_ctx_t *ctx,
 		int i915;
 		const intel_ctx_t *child_ctx;
 
-		i915 = gem_reopen_driver(fd);
+		i915 = drm_reopen_driver(fd);
 		child_ctx = intel_ctx_create(i915, &ctx->cfg);
 		execbuf.rsvd1 = child_ctx->id;
 
tests/i915/gem_exec_parallel.c +1 -1
index 705b22cb..97257ea4 100644
@@ -86,7 +86,7 @@ static void *thread(void *data)
 	pthread_mutex_unlock(t->mutex);
 
 	if (t->flags & FDS) {
-		fd = gem_reopen_driver(t->fd);
+		fd = drm_reopen_driver(t->fd);
 	} else {
 		fd = t->fd;
 	}
tests/i915/gem_exec_whisper.c +2 -2
index 29d96cdc..80e4b391 100644
@@ -98,7 +98,7 @@ static void init_hang(struct hang *h, int fd, const intel_ctx_cfg_t *cfg)
 	uint32_t *batch;
 	int i, gen;
 
-	h->fd = gem_reopen_driver(fd);
+	h->fd = drm_reopen_driver(fd);
 	igt_allow_hang(h->fd, 0, 0);
 
 	gen = intel_gen(intel_get_drm_devid(h->fd));
@@ -329,7 +329,7 @@ static void whisper(int fd, const intel_ctx_t *ctx,
 
 		if (flags & FDS) {
 			for (n = 0; n < 64; n++) {
-				fds[n] = gem_reopen_driver(fd);
+				fds[n] = drm_reopen_driver(fd);
 			}
 		}
 		if (flags & (CONTEXTS | QUEUES | FDS)) {
tests/i915/gem_lmem_evict.c +1 -1
index 71a066de..d2611bd5 100644
@@ -57,7 +57,7 @@ static void test_dontneed_evict_race(int fd,
 	igt_fork(child, 1) {
 		uint32_t handle2;
 
-		fd = gem_reopen_driver(fd);
+		fd = drm_reopen_driver(fd);
 
 		handle2 = gem_create_in_memory_region_list(fd,
 							   size, 0,
tests/i915/gem_lmem_swapping.c +3 -3
index 55b044ec..4177286b 100644
@@ -539,7 +539,7 @@ static void test_evict(int i915,
 	fill_params(i915, &params, region, flags, nproc, false);
 
 	if (flags & TEST_PARALLEL) {
-		int fd = gem_reopen_driver(i915);
+		int fd = drm_reopen_driver(i915);
 
 		intel_allocator_multiprocess_start();
 		ctx = intel_ctx_create_all_physical(fd);
@@ -610,7 +610,7 @@ static void test_smem_oom(int i915,
 
 	/* process for testing lmem eviction */
 	igt_fork(child, 1) {
-		int fd = gem_reopen_driver(i915);
+		int fd = drm_reopen_driver(i915);
 		struct params params;
 
 		fill_params(i915, &params, region, 0, 1, true);
@@ -637,7 +637,7 @@ static void test_smem_oom(int i915,
 				}
 			}
 			igt_fork(child, 1) {
-				int fd = gem_reopen_driver(i915);
+				int fd = drm_reopen_driver(i915);
 
 				for (int pass = 0; pass < num_alloc; pass++) {
 					if (READ_ONCE(*lmem_done))
tests/i915/gem_mmap_gtt.c +3 -4
index c14ab50e..0b3a6e5b 100644
@@ -41,7 +41,6 @@
 #include <sys/wait.h>
 #include "drm.h"
 
-#include "i915/gem.h"
 #include "i915/gem_create.h"
 #include "igt.h"
 #include "igt_sysfs.h"
@@ -360,8 +359,8 @@ static void
 test_isolation(int i915)
 {
 	struct drm_i915_gem_mmap_gtt mmap_arg;
-	int A = gem_reopen_driver(i915);
-	int B = gem_reopen_driver(i915);
+	int A = drm_reopen_driver(i915);
+	int B = drm_reopen_driver(i915);
 	uint64_t offset_a, offset_b;
 	uint32_t a, b;
 	void *ptr;
@@ -448,7 +447,7 @@ test_flink_race(int i915)
 	igt_assert(handles != MAP_FAILED);
 
 	igt_fork(child, ncpus + 1) {
-		int fd = gem_reopen_driver(i915);
+		int fd = drm_reopen_driver(i915);
 
 		do {
 			struct drm_i915_gem_mmap_gtt mmap_arg = {};
tests/i915/gem_mmap_offset.c +4 -5
index 962fc1b7..e7659e30 100644
@@ -33,7 +33,6 @@
 #include <unistd.h>
 #include "drm.h"
 
-#include "i915/gem.h"
 #include "i915/gem_create.h"
 #include "i915/intel_memory_region.h"
 #include "igt.h"
@@ -299,8 +298,8 @@ static void isolation(int i915)
 			struct drm_i915_gem_mmap_offset mmap_arg = {
 				.flags = t->type
 			};
-			int A = gem_reopen_driver(i915);
-			int B = gem_reopen_driver(i915);
+			int A = drm_reopen_driver(i915);
+			int B = drm_reopen_driver(i915);
 			uint64_t offset_a, offset_b;
 			uint32_t a, b;
 			void *ptr;
@@ -622,7 +621,7 @@ static void open_flood(int i915, int timeout)
 			continue;
 
 		igt_fork(child, 1) {
-			i915 = gem_reopen_driver(i915);
+			i915 = drm_reopen_driver(i915);
 			arg.handle = prime_fd_to_handle(i915, dmabuf);
 
 			do {
@@ -636,7 +635,7 @@ static void open_flood(int i915, int timeout)
 	igt_until_timeout(timeout) {
 		int tmp;
 
-		tmp = gem_reopen_driver(i915);
+		tmp = drm_reopen_driver(i915);
 		handle = prime_fd_to_handle(i915, dmabuf);
 
 		for_each_mmap_offset_type(i915, t) {
tests/i915/gem_reset_stats.c +15 -15
index 7b003d88..ddc61781 100644
@@ -267,7 +267,7 @@ static void test_rs(const struct intel_execution_ring *e,
 	igt_debug("num fds=%d, hang index=%d\n", num_fds, hang_index);
 
 	for (i = 0; i < num_fds; i++) {
-		fd[i] = gem_reopen_driver(device);
+		fd[i] = drm_reopen_driver(device);
 		assert_reset_status(i, fd[i], 0, RS_NO_ERROR);
 	}
 
@@ -318,7 +318,7 @@ static void test_rs_ctx(const struct intel_execution_ring *e,
 	test_rs(e, num_fds, -1, RS_NO_ERROR);
 
 	for (i = 0; i < num_fds; i++) {
-		fd[i] = gem_reopen_driver(device);
+		fd[i] = drm_reopen_driver(device);
 		igt_assert(fd[i]);
 		assert_reset_status(i, fd[i], 0, RS_NO_ERROR);
 
@@ -384,8 +384,8 @@ static void test_ban(const struct intel_execution_ring *e)
 	int ban, retry = 10;
 	int active_count = 0;
 
-	fd_bad = gem_reopen_driver(device);
-	fd_good = gem_reopen_driver(device);
+	fd_bad = drm_reopen_driver(device);
+	fd_good = drm_reopen_driver(device);
 
 	assert_reset_status(fd_bad, fd_bad, 0, RS_NO_ERROR);
 	assert_reset_status(fd_good, fd_good, 0, RS_NO_ERROR);
@@ -438,7 +438,7 @@ static void test_ban_ctx(const struct intel_execution_ring *e)
 	uint32_t ctx_good, ctx_bad;
 	int active_count = 0;
 
-	fd = gem_reopen_driver(device);
+	fd = drm_reopen_driver(device);
 
 	assert_reset_status(fd, fd, 0, RS_NO_ERROR);
 
@@ -494,8 +494,8 @@ static void test_unrelated_ctx(const struct intel_execution_ring *e)
 	int fd1,fd2;
 	int ctx_guilty, ctx_unrelated;
 
-	fd1 = gem_reopen_driver(device);
-	fd2 = gem_reopen_driver(device);
+	fd1 = drm_reopen_driver(device);
+	fd2 = drm_reopen_driver(device);
 	assert_reset_status(0, fd1, 0, RS_NO_ERROR);
 	assert_reset_status(1, fd2, 0, RS_NO_ERROR);
 	ctx_guilty = gem_context_create(fd1);
@@ -530,7 +530,7 @@ static int get_reset_count(int fd, int ctx)
 
 static void test_close_pending_ctx(const struct intel_execution_ring *e)
 {
-	int fd = gem_reopen_driver(device);
+	int fd = drm_reopen_driver(device);
 	uint32_t ctx = gem_context_create(fd);
 
 	assert_reset_status(fd, fd, ctx, RS_NO_ERROR);
@@ -544,7 +544,7 @@ static void test_close_pending_ctx(const struct intel_execution_ring *e)
 
 static void test_close_pending(const struct intel_execution_ring *e)
 {
-	int fd = gem_reopen_driver(device);
+	int fd = drm_reopen_driver(device);
 
 	assert_reset_status(fd, fd, 0, RS_NO_ERROR);
 
@@ -588,7 +588,7 @@ static void noop_on_each_ring(int fd, const bool reverse)
 static void test_close_pending_fork(const struct intel_execution_ring *e,
 				    const bool reverse)
 {
-	int fd = gem_reopen_driver(device);
+	int fd = drm_reopen_driver(device);
 	igt_hang_t hang;
 	int pid;
 
@@ -603,7 +603,7 @@ static void test_close_pending_fork(const struct intel_execution_ring *e,
 	 */
 	pid = fork();
 	if (pid == 0) {
-		const int fd2 = gem_reopen_driver(device);
+		const int fd2 = drm_reopen_driver(device);
 		igt_assert_lte(0, fd2);
 
 		/* The crucial component is that we schedule the same noop batch
@@ -630,7 +630,7 @@ static void test_close_pending_fork(const struct intel_execution_ring *e,
 static void test_reset_count(const struct intel_execution_ring *e,
 			     const bool create_ctx)
 {
-	int fd = gem_reopen_driver(device);
+	int fd = drm_reopen_driver(device);
 	int ctx;
 	long c1, c2;
 
@@ -733,7 +733,7 @@ static void test_params_ctx(void)
 {
 	int fd;
 
-	fd = gem_reopen_driver(device);
+	fd = drm_reopen_driver(device);
 	_test_param(fd, gem_context_create(fd));
 	close(fd);
 }
@@ -742,7 +742,7 @@ static void test_params(void)
 {
 	int fd;
 
-	fd = gem_reopen_driver(device);
+	fd = drm_reopen_driver(device);
 	_test_param(fd, 0);
 	close(fd);
 }
@@ -767,7 +767,7 @@ static void defer_hangcheck(const struct intel_execution_ring *engine)
 	int fd, count_start, count_end;
 	int seconds = 30;
 
-	fd = gem_reopen_driver(device);
+	fd = drm_reopen_driver(device);
 
 	next = next_engine(fd, engine);
 	igt_skip_on(next == engine);
tests/i915/gem_ringfill.c +1 -1
index afcd7b73..de6e26bf 100644
@@ -219,7 +219,7 @@ static void run_test(int fd, const intel_ctx_t *ctx, unsigned ring,
 		igt_fork(child, nchild) {
 			const intel_ctx_t *child_ctx = NULL;
 			if (flags & NEWFD) {
-				fd = gem_reopen_driver(fd);
+				fd = drm_reopen_driver(fd);
 				child_ctx = intel_ctx_create(fd, &ctx->cfg);
 
 				setup_execbuf(fd, child_ctx, &execbuf, obj, reloc, ring);
tests/i915/gem_softpin.c +1 -1
index 8717860b..933daa4a 100644
@@ -1160,7 +1160,7 @@ static void *thread(void *data)
 	uint32_t batch = MI_BATCH_BUFFER_END;
 	int fd, ret, succeeded = 0;
 
-	fd = gem_reopen_driver(t->fd);
+	fd = drm_reopen_driver(t->fd);
 	ctx = intel_ctx_create(fd, &t->ctx->cfg);
 	offset_obj = gem_detect_safe_start_offset(fd);
 	offset_bb = ALIGN(offset_obj + 4096, gem_detect_safe_alignment(fd));
tests/i915/gem_userptr_blits.c +1 -1
index b00afc32..baba7cf3 100644
@@ -669,7 +669,7 @@ static void test_nohangcheck_hostile(int i915)
 	 * Even if the user disables hangcheck, we must still recover.
 	 */
 
-	i915 = gem_reopen_driver(i915);
+	i915 = drm_reopen_driver(i915);
 	gem_require_contexts(i915);
 
 	dir = igt_params_open(i915);
tests/i915/gem_vm_create.c +1 -1
index f47d8c55..44958cce 100644
@@ -306,7 +306,7 @@ static void isolation(int i915)
 	struct drm_i915_gem_context_param arg = {
 		.param = I915_CONTEXT_PARAM_VM,
 	};
-	int other = gem_reopen_driver(i915);
+	int other = drm_reopen_driver(i915);
 	uint32_t ctx[2], vm[2], result;
 	int loops = 4096;
 
tests/i915/gem_watchdog.c +1 -1
index 27f3a2d7..47ccd2ca 100644
@@ -564,7 +564,7 @@ igt_main
 					timeout * 1000);
 		default_timeout_wait_s = timeout * 5;
 
-		i915 = gem_reopen_driver(i915); /* Apply modparam. */
+		i915 = drm_reopen_driver(i915); /* Apply modparam. */
 		ctx = intel_ctx_create_all_physical(i915);
 	}
 
tests/i915/gem_workarounds.c +1 -1
index 7d119962..ae544adb 100644
@@ -198,7 +198,7 @@ static void check_workarounds(int fd, enum operation op, unsigned int flags)
 	const intel_ctx_t *ctx;
 
 	if (flags & FD)
-		fd = gem_reopen_driver(fd);
+		fd = drm_reopen_driver(fd);
 
 	ctx = intel_ctx_0(fd);
 	if (flags & CONTEXT) {
tests/i915/i915_suspend.c +1 -1
index a9507964..5b289ecb 100644
@@ -178,7 +178,7 @@ test_shrink(int fd, unsigned int mode)
 	gem_quiescent_gpu(fd);
 
 	igt_multi_fork(child, 1) {
-		fd = gem_reopen_driver(fd);
+		fd = drm_reopen_driver(fd);
 		igt_purge_vm_caches(fd);
 
 		mem = igt_get_total_pinnable_mem(&size);
tests/i915/perf.c +1 -1
index 9ca4d34b..cd73b1a9 100644
@@ -4513,7 +4513,7 @@ gen12_test_single_ctx_render_target_writes_a_counter(const struct intel_executio
 	do {
 		igt_fork_helper(&child) {
 			/* A local device for local resources. */
-			drm_fd = gem_reopen_driver(drm_fd);
+			drm_fd = drm_reopen_driver(drm_fd);
 
 			igt_drop_root();
 			gen12_single_ctx_helper(e);
Signature · 1 line
2.25.1