From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id 35E9610E1CD for ; Thu, 20 Jul 2023 23:18:04 +0000 (UTC) From: Ashutosh Dixit To: igt-dev@lists.freedesktop.org Date: Thu, 20 Jul 2023 16:17:48 -0700 Message-ID: <20230720231756.3464641-13-ashutosh.dixit@intel.com> In-Reply-To: <20230720231756.3464641-1-ashutosh.dixit@intel.com> References: <20230720231756.3464641-1-ashutosh.dixit@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [igt-dev] [PATCH i-g-t 12/20] tests/i915/perf: Don't load module List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" List-ID: 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 --- 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