[Intel-gfx] [PATCH igt] igt/gem_busy: Fix extended-bsd aliasing checks

[Tvrtko Ursulin]

On 24/02/2018 19:14, Chris Wilson wrote:
> Although we want to specify exactly which physical engine to run on, the
> busy ioctl can only return the I915_EXEC_RING identifier, i.e. the
> aliased I915_EXEC_BSD for vcs0/vcs1. Horrors.
> 
> Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
> ---
>   tests/gem_busy.c | 7 ++++---
>   1 file changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/tests/gem_busy.c b/tests/gem_busy.c
> index 831bbab1..fcff51a2 100644
> --- a/tests/gem_busy.c
> +++ b/tests/gem_busy.c
> @@ -166,6 +166,7 @@ static void one(int fd, unsigned ring, unsigned test_flags)
>   	struct drm_i915_gem_relocation_entry store[1024+1];
>   	struct drm_i915_gem_execbuffer2 execbuf;
>   	unsigned size = ALIGN(ARRAY_SIZE(store)*16 + 4, 4096);
> +	const unsigned uabi = ring & 63;
>   	uint32_t read[2], write[2];
>   	struct timespec tv;
>   	uint32_t *batch, *bbe;
> @@ -267,11 +268,11 @@ static void one(int fd, unsigned ring, unsigned test_flags)
>   		timeout = 1;
>   	}
>   
> -	igt_assert_eq(write[SCRATCH], ring);
> -	igt_assert_eq_u32(read[SCRATCH], 1 << ring);
> +	igt_assert_eq(write[SCRATCH], uabi);
> +	igt_assert_eq_u32(read[SCRATCH], 1 << uabi);
>   
>   	igt_assert_eq(write[BATCH], 0);
> -	igt_assert_eq_u32(read[BATCH], 1 << ring);
> +	igt_assert_eq_u32(read[BATCH], 1 << uabi);
>   
>   	/* Calling busy in a loop should be enough to flush the rendering */
>   	memset(&tv, 0, sizeof(tv));
> 

Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin at intel.com>

Regards,

Tvrtko