[igt-dev] [PATCH i-g-t v2 1/2] tests/i915/pm_rc6_residency: Refactoring intel_ctx_t to igt_fixture

[Gupta, Anshuman]

> -----Original Message-----
> From: Tauro, Riana <riana.tauro at intel.com>
> Sent: Tuesday, June 21, 2022 7:15 PM
> To: igt-dev at lists.freedesktop.org
> Cc: Tauro, Riana <riana.tauro at intel.com>; Gupta, Anshuman
> <anshuman.gupta at intel.com>; Dixit, Ashutosh <ashutosh.dixit at intel.com>
> Subject: [PATCH i-g-t v2 1/2] tests/i915/pm_rc6_residency: Refactoring
> intel_ctx_t to igt_fixture
> 
> Refactor code to move intel_ctx_create_all_physical() and
> intel_ctx_destroy() to igt_fixture to be used by rc6_fence and other tests.
> 
> No functional changes
> 
> v2 : refactor code (Anshuman)
LGTM.
Reviewed-by: Anshuman Gupta <anshuman.gupta at intel.com>
> 
> Signed-off-by: Riana Tauro <riana.tauro at intel.com>
> ---
>  tests/i915/i915_pm_rc6_residency.c | 14 +++++++-------
>  1 file changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/tests/i915/i915_pm_rc6_residency.c
> b/tests/i915/i915_pm_rc6_residency.c
> index cf9eae90..7c1ff32b 100644
> --- a/tests/i915/i915_pm_rc6_residency.c
> +++ b/tests/i915/i915_pm_rc6_residency.c
> @@ -449,13 +449,12 @@ static void rc6_idle(int i915)
>  	}
>  }
> 
> -static void rc6_fence(int i915)
> +static void rc6_fence(int i915, const intel_ctx_t *ctx)
>  {
>  	const int64_t duration_ns = SLEEP_DURATION *
> (int64_t)NSEC_PER_SEC;
>  	const int tolerance = 20; /* Some RC6 is better than none! */
>  	const unsigned int gen = intel_gen(intel_get_drm_devid(i915));
>  	const struct intel_execution_engine2 *e;
> -	const intel_ctx_t *ctx;
>  	struct power_sample sample[2];
>  	unsigned long slept;
>  	uint64_t rc6, ts[2], ahnd;
> @@ -485,7 +484,6 @@ static void rc6_fence(int i915)
>  	assert_within_epsilon(rc6, ts[1] - ts[0], 5);
> 
>  	/* Submit but delay execution, we should be idle and conserving power
> */
> -	ctx = intel_ctx_create_all_physical(i915);
>  	ahnd = get_reloc_ahnd(i915, ctx->id);
>  	for_each_ctx_engine(i915, ctx, e) {
>  		igt_spin_t *spin;
> @@ -524,7 +522,6 @@ static void rc6_fence(int i915)
>  		assert_within_epsilon(rc6, ts[1] - ts[0], tolerance);
>  		gem_quiescent_gpu(i915);
>  	}
> -	intel_ctx_destroy(i915, ctx);
>  	put_ahnd(ahnd);
> 
>  	rapl_close(&rapl);
> @@ -534,10 +531,12 @@ static void rc6_fence(int i915)  igt_main  {
>  	int i915 = -1;
> +	const intel_ctx_t *ctx;
> 
>  	/* Use drm_open_driver to verify device existence */
>  	igt_fixture {
>  		i915 = drm_open_driver(DRIVER_INTEL);
> +		ctx = intel_ctx_create_all_physical(i915);
>  	}
> 
>  	igt_subtest("rc6-idle") {
> @@ -551,7 +550,7 @@ igt_main
>  		igt_require_gem(i915);
>  		gem_quiescent_gpu(i915);
> 
> -		rc6_fence(i915);
> +		rc6_fence(i915, ctx);
>  	}
> 
>  	igt_subtest_group {
> @@ -592,7 +591,8 @@ igt_main
>  			close(sysfs);
>  	}
> 
> -	igt_fixture
> +	igt_fixture {
> +		intel_ctx_destroy(i915, ctx);
>  		close(i915);
> -
> +	}
>  }
> --
> 2.25.1