It is expected that only the same region is going to be tested for, so there is no use getting the region name for every test for a given driver.
Signed-off-by: Thadeu Lima de Souza Cascardo <[email protected]> --- tests/drv_dmem_cgroups.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/tests/drv_dmem_cgroups.c b/tests/drv_dmem_cgroups.c index 0791bb62d3a2..30f9caf3630c 100644 --- a/tests/drv_dmem_cgroups.c +++ b/tests/drv_dmem_cgroups.c @@ -124,18 +124,14 @@ static int fill_vram(const struct igt_dmem_driver *drv, void *ctx, int fd, int m return n_bo; } -static void test_write_eviction(int fd, unsigned int flags, const struct igt_dmem_driver *drv) +static void test_write_eviction(int fd, char *cg_region, unsigned int flags, const struct igt_dmem_driver *drv) { void *ctx; struct igt_cgroup *cg; - char *cg_region; int n_bo = 0, max_bo; uint64_t current, capacity, cg_max, limit, after; int set_err, err; - cg_region = drv->get_region_name(fd); - igt_require_f(cg_region, "Region not tracked by dmem cgroup controller\n"); - igt_cgroup_dmem_get_capacity(cg_region, &capacity); igt_require_f(capacity >= 4 * BO_SIZE, "VRAM capacity (%"PRIu64" MiB) too small to test\n", @@ -215,7 +211,6 @@ static void test_write_eviction(int fd, unsigned int flags, const struct igt_dme igt_cgroup_dmem_set_max(cg, cg_region, IGT_CGROUP_DMEM_MAX); drv->free_vram(ctx, n_bo, BO_SIZE); drv->deinit(ctx); - free(cg_region); igt_cgroup_free(cg); } @@ -230,18 +225,14 @@ static int allocate_vram(const struct igt_dmem_driver *drv, void *ctx, int fd, i return err ?: n_bo; } -static void test_current(int fd, unsigned int flags, const struct igt_dmem_driver *drv) +static void test_current(int fd, char *cg_region, unsigned int flags, const struct igt_dmem_driver *drv) { struct igt_cgroup *cg; - char *cg_region; void *ctx; uint64_t current, capacity, cg_max; int n_bo = 0, max_bo; int err; - cg_region = drv->get_region_name(fd); - igt_require_f(cg_region, "Region not tracked by dmem cgroup controller\n"); - igt_cgroup_dmem_get_capacity(cg_region, &capacity); igt_require_f(capacity >= 4 * BO_SIZE, "VRAM capacity (%"PRIu64" MiB) too small to test\n", @@ -339,13 +330,12 @@ static void test_current(int fd, unsigned int flags, const struct igt_dmem_drive current / SZ_1M, USAGE_SLACK / SZ_1M); drv->deinit(ctx); - free(cg_region); igt_cgroup_free(cg); } static const struct { const char *name; - void (*test_fn)(int fd, unsigned int flags, const struct igt_dmem_driver *drv); + void (*test_fn)(int fd, char *cg_region, unsigned int flags, const struct igt_dmem_driver *drv); unsigned int flags; } subtests[] = { { "current", test_current, 0 }, @@ -376,20 +366,24 @@ int igt_main() for (int d = 0; drivers[d].driver; d++) { igt_subtest_group() { int fd = -1; + char *cg_region; igt_fixture() { fd = drm_open_driver(drivers[d].driver_flag); igt_require_f(fd >= 0, "No %s device found, skipping\n", drivers[d].driver->name); + cg_region = drivers[d].driver->get_region_name(fd); + igt_require_f(cg_region, "Region not tracked by dmem cgroup controller\n"); } for (int i = 0; subtests[i].name; i++) igt_subtest_f("%s-%s", drivers[d].driver->name, subtests[i].name) - subtests[i].test_fn(fd, subtests[i].flags, drivers[d].driver); + subtests[i].test_fn(fd, cg_region, subtests[i].flags, drivers[d].driver); igt_fixture() { if (fd >= 0) drm_close_driver(fd); + free(cg_region); } } } -- 2.47.3
