| Message ID | 20220121010928.3021085-1-John.C.Harrison@Intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [i-g-t] tests/i915/gem_exec_capture: Fix memory object size in gem_exec_capture | expand |
On Thu, 20 Jan 2022 17:09:28 -0800, John.C.Harrison@Intel.com wrote: > > From: John Harrison <John.C.Harrison@Intel.com> > > The capture tests require knowing exactly how big the test allocation > is. Part of the test is to compare the captured size against the > allocated size to make sure they match. That doesn't work if the > allocator creates an object of a different size than was requested > without reporting the larger size. Reviewed-by: Ashutosh Dixit <ashutosh.dixit@intel.com> > Fixes: 85a593809 ("tests/i915/gem_exec_capture: Add support for local memory") > Signed-off-by: John Harrison <John.C.Harrison@Intel.com> > --- > tests/i915/gem_exec_capture.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/tests/i915/gem_exec_capture.c b/tests/i915/gem_exec_capture.c > index 5b2482518..60f8df04c 100644 > --- a/tests/i915/gem_exec_capture.c > +++ b/tests/i915/gem_exec_capture.c > @@ -387,10 +387,9 @@ static void capture(int fd, int dir, const intel_ctx_t *ctx, > const struct intel_execution_engine2 *e, uint32_t region) > { > uint32_t handle; > - uint64_t ahnd; > - int obj_size = 4096; > + uint64_t ahnd, obj_size = 4096; > > - handle = gem_create_in_memory_regions(fd, obj_size, region); > + igt_assert_eq(__gem_create_in_memory_regions(fd, &handle, &obj_size, region), 0); > ahnd = get_reloc_ahnd(fd, ctx->id); > > __capture1(fd, dir, ahnd, ctx, e, handle, obj_size, region); > -- > 2.25.1 >
diff --git a/tests/i915/gem_exec_capture.c b/tests/i915/gem_exec_capture.c index 5b2482518..60f8df04c 100644 --- a/tests/i915/gem_exec_capture.c +++ b/tests/i915/gem_exec_capture.c @@ -387,10 +387,9 @@ static void capture(int fd, int dir, const intel_ctx_t *ctx, const struct intel_execution_engine2 *e, uint32_t region) { uint32_t handle; - uint64_t ahnd; - int obj_size = 4096; + uint64_t ahnd, obj_size = 4096; - handle = gem_create_in_memory_regions(fd, obj_size, region); + igt_assert_eq(__gem_create_in_memory_regions(fd, &handle, &obj_size, region), 0); ahnd = get_reloc_ahnd(fd, ctx->id); __capture1(fd, dir, ahnd, ctx, e, handle, obj_size, region);