Return-Path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9FAD76E311 for ; Mon, 2 Nov 2020 19:50:04 +0000 (UTC) From: Umesh Nerlige Ramappa Date: Mon, 2 Nov 2020 11:49:57 -0800 Message-Id: <20201102194957.30123-1-umesh.nerlige.ramappa@intel.com> MIME-Version: 1.0 Subject: [igt-dev] [PATCH i-g-t] i915/perf: Make sure i915 is loaded before reading proc List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" To: igt-dev@lists.freedesktop.org Cc: Petri Latvala List-ID: The previous test may have unloaded i915 or failed to load it back. To combat such cases, each test fixture is supposed to ensure that i915 is loaded prior to running the subtests. In most fixtures this happens automatically when we try to get a handle to i915. In perf OA, we stat some proc/sys files even before getting a handle to i915. Occassionally, perf tests fail trying to stat these files. Fix perf OA by checking and loading i915 if it's not loaded. v2: Use drm_load_module() (Petri) Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/405 Signed-off-by: Umesh Nerlige Ramappa Reviewed-by: Petri Latvala Reviewed-by: Ashutosh Dixit --- tests/i915/perf.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tests/i915/perf.c b/tests/i915/perf.c index a5c4adc3..caeabd62 100644 --- a/tests/i915/perf.c +++ b/tests/i915/perf.c @@ -4806,6 +4806,13 @@ igt_main 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("/proc/sys/dev/i915/perf_stream_paranoid", &sb) == 0); igt_require(stat("/proc/sys/dev/i915/oa_max_sample_rate", &sb) -- 2.20.1 _______________________________________________ igt-dev mailing list igt-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/igt-dev