[igt-dev] [PATCH i-g-t 34/93] tests/prime_busy: Convert to intel_ctx_t

[Zbigniew Kempczyński]

On Wed, Jun 09, 2021 at 12:36:17PM -0500, Jason Ekstrand wrote:
> Signed-off-by: Jason Ekstrand <jason at jlekstrand.net>
> ---
>  tests/prime_busy.c | 19 ++++++++++++-------
>  1 file changed, 12 insertions(+), 7 deletions(-)
> 
> diff --git a/tests/prime_busy.c b/tests/prime_busy.c
> index 8bf50eaf..e2684837 100644
> --- a/tests/prime_busy.c
> +++ b/tests/prime_busy.c
> @@ -40,7 +40,7 @@ static bool prime_busy(struct pollfd *pfd, bool excl)
>  #define HANG 0x4
>  #define POLL 0x8
>  
> -static void busy(int fd, unsigned ring, unsigned flags)
> +static void busy(int fd, const intel_ctx_t *ctx, unsigned ring, unsigned flags)
>  {
>  	const int gen = intel_gen(intel_get_drm_devid(fd));
>  	const uint32_t _bbe = MI_BATCH_BUFFER_END;
> @@ -63,6 +63,7 @@ static void busy(int fd, unsigned ring, unsigned flags)
>  	execbuf.flags = ring;
>  	if (gen < 6)
>  		execbuf.flags |= I915_EXEC_SECURE;
> +	execbuf.rsvd1 = ctx->id;
>  
>  	memset(obj, 0, sizeof(obj));
>  	obj[SCRATCH].handle = gem_create(fd, 4096);
> @@ -186,7 +187,7 @@ static void busy(int fd, unsigned ring, unsigned flags)
>  	close(pfd[SCRATCH].fd);
>  }
>  
> -static void test_mode(int fd, unsigned int flags)
> +static void test_mode(int fd, const intel_ctx_t *ctx, unsigned int flags)
>  {
>  	const struct intel_execution_engine2 *e;
>  	igt_hang_t hang = {};
> @@ -196,7 +197,7 @@ static void test_mode(int fd, unsigned int flags)
>  	else
>  		hang = igt_allow_hang(fd, 0, 0);
>  
> -	__for_each_physical_engine(fd, e) {
> +	for_each_ctx_engine(fd, ctx, e) {
>  		if (!gem_class_can_store_dword(fd, e->class))
>  			continue;
>  
> @@ -204,7 +205,7 @@ static void test_mode(int fd, unsigned int flags)
>  			continue;
>  
>  		igt_dynamic_f("%s", e->name)
> -			busy(fd, e->flags, flags);
> +			busy(fd, ctx, e->flags, flags);
>  	}
>  
>  	if ((flags & HANG) == 0)
> @@ -215,11 +216,13 @@ static void test_mode(int fd, unsigned int flags)
>  
>  igt_main
>  {
> +	const intel_ctx_t *ctx;
>  	int fd = -1;
>  
>  	igt_fixture {
>  		fd = drm_open_driver_master(DRIVER_INTEL);
>  		igt_require_gem(fd);
> +		ctx = intel_ctx_create_all_physical(fd);
>  	}
>  
>  	igt_subtest_group {
> @@ -238,13 +241,15 @@ igt_main
>  
>  		for (const struct mode *m = modes; m->name; m++) {
>  			igt_subtest_with_dynamic(m->name)
> -				test_mode(fd, m->flags);
> +				test_mode(fd, ctx, m->flags);
>  
>  			igt_subtest_with_dynamic_f("%s-wait", m->name)
> -				test_mode(fd, m->flags | POLL);
> +				test_mode(fd, ctx, m->flags | POLL);
>  		}
>  	}
>  
> -	igt_fixture
> +	igt_fixture {
> +		intel_ctx_destroy(fd, ctx);
>  		close(fd);
> +	}
>  }
> -- 
> 2.31.1

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

--
Zbigniew

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