[igt-dev] [PATCH i-g-t 12/20] tests/i915/perf: Don't load module

Ashutosh Dixit ashutosh.dixit at intel.com
Thu Jul 20 23:17:48 UTC 2023


Because now the perf code is being shared between i915 and xe, we have two
modules to load and can't decide which to load unless we've loaded one. So
to avoid the chicken and egg issue, don't load any module. The default
module in the system should automatically get loaded.

Signed-off-by: Ashutosh Dixit <ashutosh.dixit at intel.com>
---
 tests/i915/perf.c | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/tests/i915/perf.c b/tests/i915/perf.c
index 7cbf3f7ca287..e0afbbc45ea2 100644
--- a/tests/i915/perf.c
+++ b/tests/i915/perf.c
@@ -5952,22 +5952,6 @@ igt_main
 	const intel_ctx_t *ctx;
 	const struct intel_execution_engine2 *e;
 
-	igt_fixture {
-		struct stat sb;
-
-		/*
-		 * Prior tests may have unloaded i915 or failed while
-		 * loading/unloading i915. Load i915 here before we stat the
-		 * files.
-		 */
-		drm_load_module(DRIVER_INTEL);
-
-		igt_require(stat(i9xe.sysctl_path_paranoid, &sb)
-			    == 0);
-		igt_require(stat(i9xe.sysctl_path_max_sample_rate, &sb)
-			    == 0);
-	}
-
 	igt_subtest("i915-ref-count")
 		test_i915_ref_count();
 
-- 
2.41.0



More information about the igt-dev mailing list