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

[Zbigniew Kempczyński]

On Mon, Jun 14, 2021 at 11:36:39AM -0500, Jason Ekstrand wrote:
> Signed-off-by: Jason Ekstrand <jason at jlekstrand.net>
> ---
>  tests/i915/gem_userptr_blits.c | 25 +++++++++++++++----------
>  1 file changed, 15 insertions(+), 10 deletions(-)
> 
> diff --git a/tests/i915/gem_userptr_blits.c b/tests/i915/gem_userptr_blits.c
> index e0e202c54..0616a9378 100644
> --- a/tests/i915/gem_userptr_blits.c
> +++ b/tests/i915/gem_userptr_blits.c
> @@ -584,7 +584,7 @@ static void test_nohangcheck_hostile(int i915)
>  {
>  	const struct intel_execution_engine2 *e;
>  	igt_hang_t hang;
> -	uint32_t ctx;
> +	const intel_ctx_t *ctx;
>  	int fence = -1;
>  	int err = 0;
>  	int dir;
> @@ -599,11 +599,11 @@ static void test_nohangcheck_hostile(int i915)
>  	dir = igt_params_open(i915);
>  	igt_require(dir != -1);
>  
> -	ctx = gem_context_create(i915);
> -	hang = igt_allow_hang(i915, ctx, 0);
> +	ctx = intel_ctx_create_all_physical(i915);
> +	hang = igt_allow_hang(i915, ctx->id, 0);
>  	igt_require(__enable_hangcheck(dir, false));
>  
> -	____for_each_physical_engine(i915, ctx, e) {
> +	for_each_ctx_engine(i915, ctx, e) {
>  		igt_spin_t *spin;
>  		int new;
>  
> @@ -611,7 +611,7 @@ static void test_nohangcheck_hostile(int i915)
>  		gem_engine_property_printf(i915, e->name,
>  					   "preempt_timeout_ms", "%d", 50);
>  
> -		spin = __igt_spin_new(i915, ctx,
> +		spin = __igt_spin_new(i915, .ctx = ctx,
>  				      .engine = e->flags,
>  				      .flags = (IGT_SPIN_NO_PREEMPTION |
>  						IGT_SPIN_USERPTR |
> @@ -633,7 +633,7 @@ static void test_nohangcheck_hostile(int i915)
>  			fence = tmp;
>  		}
>  	}
> -	gem_context_destroy(i915, ctx);
> +	intel_ctx_destroy(i915, ctx);
>  	igt_assert(fence != -1);
>  
>  	if (sync_fence_wait(fence, MSEC_PER_SEC)) { /* 640ms preempt-timeout */
> @@ -1210,7 +1210,8 @@ static int test_dmabuf(void)
>  	return 0;
>  }
>  
> -static void store_dword_rand(int i915, unsigned int engine,
> +static void store_dword_rand(int i915, const intel_ctx_t *ctx,
> +			     unsigned int engine,
>  			     uint32_t target, uint64_t sz,
>  			     int count)
>  {
> @@ -1242,6 +1243,7 @@ static void store_dword_rand(int i915, unsigned int engine,
>  	exec.flags = engine;
>  	if (gen < 6)
>  		exec.flags |= I915_EXEC_SECURE;
> +	exec.rsvd1 = ctx->id;
>  
>  	i = 0;
>  	for (int n = 0; n < count; n++) {
> @@ -1359,17 +1361,19 @@ static void test_readonly(int i915)
>  
>  	igt_fork(child, 1) {
>  		const struct intel_execution_engine2 *e;
> +		const intel_ctx_t *ctx;
>  		char *orig;
>  
>  		orig = g_compute_checksum_for_data(G_CHECKSUM_SHA1, pages, sz);
>  
>  		gem_userptr(i915, space, total, true, userptr_flags, &rhandle);
>  
> -		__for_each_physical_engine(i915, e) {
> +		ctx = intel_ctx_create_all_physical(i915);
> +		for_each_ctx_engine(i915, ctx, e) {
>  			char *ref, *result;
>  
>  			/* First tweak the backing store through the write */
> -			store_dword_rand(i915, e->flags, whandle, sz, 64);
> +			store_dword_rand(i915, ctx, e->flags, whandle, sz, 64);
>  			gem_sync(i915, whandle);
>  			ref = g_compute_checksum_for_data(G_CHECKSUM_SHA1,
>  							  pages, sz);
> @@ -1378,7 +1382,7 @@ static void test_readonly(int i915)
>  			igt_assert(strcmp(ref, orig));
>  
>  			/* Now try the same through the read-only handle */
> -			store_dword_rand(i915, e->flags, rhandle, total, 64);
> +			store_dword_rand(i915, ctx, e->flags, rhandle, total, 64);
>  			gem_sync(i915, rhandle);
>  			result = g_compute_checksum_for_data(G_CHECKSUM_SHA1,
>  							     pages, sz);
> @@ -1394,6 +1398,7 @@ static void test_readonly(int i915)
>  			g_free(orig);
>  			orig = ref;
>  		}
> +		intel_ctx_destroy(i915, ctx);
>  
>  		gem_close(i915, rhandle);
>  

Looks ok:

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

--
Zbigniew

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