diff options
| author | Rob Clark <robdclark@chromium.org> | 2022-05-21 10:57:02 -0700 |
|---|---|---|
| committer | Rob Clark <robdclark@chromium.org> | 2022-05-31 14:05:16 -0700 |
| commit | 5857938d4d3539deb43ecb03604b7c664b75e57d (patch) | |
| tree | cdf66e4b2ed29d192503e81291dd35cf0ae38fbc /tests/eviction_common.c | |
| parent | 9ce1c981ab12b2036cce6eeaa725e724c8e51668 (diff) | |
igt: Promote/rename OS helpers
Promote intel_os.c helpers to igt_os.c, so that I can re-use them for
some additional msm tests. Just big churny rename, no functional change.
Signed-off-by: Rob Clark <robdclark@chromium.org>
Reviewed-by: Petri Latvala <petri.latvala@intel.com>
Diffstat (limited to 'tests/eviction_common.c')
| -rw-r--r-- | tests/eviction_common.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tests/eviction_common.c b/tests/eviction_common.c index 8446c421..95af106c 100644 --- a/tests/eviction_common.c +++ b/tests/eviction_common.c @@ -72,7 +72,7 @@ static int minor_evictions(int fd, struct igt_eviction_test_ops *ops, total_surfaces = gem_aperture_size(fd) / surface_size + 1; igt_require(nr_surfaces < total_surfaces); - intel_require_memory(total_surfaces, surface_size, CHECK_RAM); + igt_require_memory(total_surfaces, surface_size, CHECK_RAM); bo = malloc((nr_surfaces + total_surfaces)*sizeof(*bo)); igt_assert(bo); @@ -107,7 +107,7 @@ static int major_evictions(int fd, struct igt_eviction_test_ops *ops, uint32_t *bo; int ret, loop; - intel_require_memory(nr_surfaces, surface_size, CHECK_RAM); + igt_require_memory(nr_surfaces, surface_size, CHECK_RAM); bo = malloc(nr_surfaces*sizeof(*bo)); igt_assert(bo); @@ -136,9 +136,9 @@ static void mlocked_evictions(int fd, struct igt_eviction_test_ops *ops, size_t total; void *mem; - intel_require_memory(surface_count, surface_size, CHECK_RAM); + igt_require_memory(surface_count, surface_size, CHECK_RAM); - mem = intel_get_total_pinnable_mem(&total); + mem = igt_get_total_pinnable_mem(&total); igt_assert(mem != MAP_FAILED); pin = *(uint64_t *)mem; igt_assert(!munlock(mem, pin)); @@ -199,12 +199,12 @@ static int swapping_evictions(int fd, struct igt_eviction_test_ops *ops, uint64_t i, n; int pass, ret; - intel_require_memory(working_surfaces, surface_size, CHECK_RAM); + igt_require_memory(working_surfaces, surface_size, CHECK_RAM); if (trash_surfaces < working_surfaces) trash_surfaces = working_surfaces; - intel_require_memory(trash_surfaces, surface_size, CHECK_RAM | CHECK_SWAP); + igt_require_memory(trash_surfaces, surface_size, CHECK_RAM | CHECK_SWAP); bo = malloc(trash_surfaces*sizeof(*bo)); igt_assert(bo); @@ -239,7 +239,7 @@ static int forking_evictions(int fd, struct igt_eviction_test_ops *ops, uint32_t *bo; int pass, ret; - intel_require_memory(working_surfaces, surface_size, CHECK_RAM); + igt_require_memory(working_surfaces, surface_size, CHECK_RAM); if (flags & FORKING_EVICTIONS_SWAPPING) { bo_count = trash_surfaces; @@ -250,7 +250,7 @@ static int forking_evictions(int fd, struct igt_eviction_test_ops *ops, bo_count = working_surfaces; igt_assert_lte(working_surfaces, bo_count); - intel_require_memory(bo_count, surface_size, CHECK_RAM | CHECK_SWAP); + igt_require_memory(bo_count, surface_size, CHECK_RAM | CHECK_SWAP); bo = malloc(bo_count*sizeof(*bo)); igt_assert(bo); |