[igt-dev] [PATCH i-g-t] i915/perf: Make sure i915 is loaded before reading proc

[Umesh Nerlige Ramappa]

On Tue, Nov 03, 2020 at 10:06:44AM +0200, Petri Latvala wrote:
>On Mon, Nov 02, 2020 at 11:49:57AM -0800, Umesh Nerlige Ramappa wrote:
>> 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 <umesh.nerlige.ramappa at intel.com>
>> Reviewed-by: Petri Latvala <petri.latvala at intel.com>
>> Reviewed-by: Ashutosh Dixit <ashutosh.dixit at intel.com>
>> ---
>
>
>Excellent, thanks. I would slap an R-b here but it's already in :P
>
Thanks Petri, Would you please also help me merge this? I don't have 
permissions.

Thanks,
Umesh
>
>-- 
>Petri Latvala
>
>
>
>>  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
>>