[igt-dev] [RFC v2 35/43] tests/i915/gem_userptr_blits: use the gem_engine_topology library

Chris Wilson chris at chris-wilson.co.uk
Fri Jun 21 10:32:57 UTC 2019


Quoting Ramalingam C (2019-06-21 11:03:37)
> Replace the legacy for_each_engine* defines with the ones
> implemented in the gem_engine_topology library.
> 
> Signed-off-by: Ramalingam C <ramalingam.c at intel.com>
> ---
>  tests/i915/gem_userptr_blits.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/tests/i915/gem_userptr_blits.c b/tests/i915/gem_userptr_blits.c
> index 1373f160b129..2433cc6668a7 100644
> --- a/tests/i915/gem_userptr_blits.c
> +++ b/tests/i915/gem_userptr_blits.c
> @@ -996,7 +996,7 @@ 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 struct intel_execution_engine2 *engine,
>                              uint32_t target, uint64_t sz,
>                              int count)
>  {
> @@ -1025,7 +1025,7 @@ static void store_dword_rand(int i915, unsigned int engine,
>         memset(&exec, 0, sizeof(exec));
>         exec.buffer_count = 2;
>         exec.buffers_ptr = to_user_pointer(obj);
> -       exec.flags = engine;
> +       exec.flags = engine->flags;
>         if (gen < 6)
>                 exec.flags |= I915_EXEC_SECURE;
>  
> @@ -1140,14 +1140,14 @@ static void test_readonly(int i915)
>         igt_assert(mprotect(space, total, PROT_READ) == 0);
>  
>         igt_fork(child, 1) {
> -               unsigned int engine;
> +               const struct intel_execution_engine2 *engine;
>                 char *orig;
>  
>                 orig = g_compute_checksum_for_data(G_CHECKSUM_SHA1, pages, sz);
>  
>                 gem_userptr(i915, space, total, true, userptr_flags, &rhandle);
>  
> -               for_each_engine(i915, engine) {
> +               __for_each_physical_engine(i915, engine) {
>                         char *ref, *result;

As written this is testing uABI, so you need to explain why it is not.
-Chris


More information about the igt-dev mailing list