[igt-dev] [PATCH i-g-t 26/77] tests/i915/gem_request_retire: Convert to intel_ctx_t

[Zbigniew Kempczyński]

On Mon, Jun 14, 2021 at 11:36:41AM -0500, Jason Ekstrand wrote:
> Signed-off-by: Jason Ekstrand <jason at jlekstrand.net>
> ---
>  tests/i915/gem_request_retire.c | 17 ++++++++++-------
>  1 file changed, 10 insertions(+), 7 deletions(-)
> 
> diff --git a/tests/i915/gem_request_retire.c b/tests/i915/gem_request_retire.c
> index c23ddfb7b..3df54f2a5 100644
> --- a/tests/i915/gem_request_retire.c
> +++ b/tests/i915/gem_request_retire.c
> @@ -62,24 +62,26 @@ static void
>  test_retire_vma_not_inactive(int fd)
>  {
>  	struct intel_execution_engine2 *e;
> -
> +	const intel_ctx_t *ctx;
>  	igt_spin_t *bg = NULL;
>  
> -	__for_each_physical_engine(fd, e) {
> +	ctx = intel_ctx_create_all_physical(fd);
> +
> +	for_each_ctx_engine(fd, ctx, e) {
>  		igt_spin_t *spin;
> -		uint32_t ctx;
> +		const intel_ctx_t *spin_ctx;
>  
>  		if (!bg) {
> -			bg = igt_spin_new(fd, .engine = e->flags);
> +			bg = igt_spin_new(fd, .ctx = ctx, .engine = e->flags);
>  			continue;
>  		}
>  
> -		ctx = gem_context_clone_with_engines(fd, 0);
> -		spin = igt_spin_new(fd, ctx,
> +		spin_ctx = intel_ctx_create(fd, &ctx->cfg);
> +		spin = igt_spin_new(fd, .ctx = spin_ctx,
>  				    .engine = e->flags,
>  				    .dependency = bg->handle,
>  				    .flags = IGT_SPIN_SOFTDEP);
> -		gem_context_destroy(fd, ctx);
> +		intel_ctx_destroy(fd, spin_ctx);
>  		igt_spin_end(spin);
>  
>  		gem_sync(fd, spin->handle);
> @@ -88,6 +90,7 @@ test_retire_vma_not_inactive(int fd)
>  
>  	igt_drop_caches_set(fd, DROP_RETIRE);
>  	igt_spin_free(fd, bg);
> +	intel_ctx_destroy(fd, ctx);
>  }

Looks ok,

Reviewed-by: Zbigniew Kempczyński <zbigniew.kempczynski at intel.com>

--
Zbigniew

>  
>  int fd;
> -- 
> 2.31.1
> 
> _______________________________________________
> igt-dev mailing list
> igt-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/igt-dev