On Mon, Mar 28, 2022 at 10:29:59AM +0100, Matthew Auld wrote:
> From: CQ Tang <cq.tang@xxxxxxxxx>
>
> On some systems lmem can be as large as 16G, which seems to trigger
> various CI timeouts, and in the best case just takes a long time. For
> the purposes of the test we should be able to limit to 4G, without any
> big loss in coverage.
>
> v2:
> - No need to try again without the modparam; if it's not supported it
> will still load the driver just fine.
>
> Signed-off-by: CQ Tang <cq.tang@xxxxxxxxx>
> Signed-off-by: Matthew Auld <matthew.auld@xxxxxxxxx>
> Cc: Thomas Hellström <thomas.hellstrom@xxxxxxxxxxxxxxx>
> Cc: Nirmoy Das <nirmoy.das@xxxxxxxxxxxxxxx>
> Reviewed-by: Thomas Hellström <thomas.hellstrom@xxxxxxxxxxxxxxx>
> Reviewed-by: Nirmoy Das <nirmoy.das@xxxxxxxxx>
> ---
> tests/i915/gem_lmem_swapping.c | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/tests/i915/gem_lmem_swapping.c b/tests/i915/gem_lmem_swapping.c
> index 31644bcd..69f7bae9 100644
> --- a/tests/i915/gem_lmem_swapping.c
> +++ b/tests/i915/gem_lmem_swapping.c
> @@ -527,7 +527,10 @@ igt_main_args("", long_options, help_str, opt_handler, NULL)
> igt_fixture {
> struct intel_execution_engine2 *e;
>
> - i915 = drm_open_driver(DRIVER_INTEL);
> + igt_i915_driver_unload();
> + igt_assert_eq(igt_i915_driver_load("lmem_size=4096"), 0);
> +
> + i915 = __drm_open_driver(DRIVER_INTEL);
A debug print would still be lovely if the param is
missing. __igt_params_get() handily tells you if lmem_size exists.
igt_debug might not be good for that kind of a print, log buffer isn't
dumped on igt_runner timeouts. igt_info maybe, igt_warn might be
overkill.
--
Petri Latvala
> igt_require_gem(i915);
> igt_require(gem_has_lmem(i915));
>
> @@ -556,6 +559,7 @@ igt_main_args("", long_options, help_str, opt_handler, NULL)
> intel_ctx_destroy(i915, ctx);
> free(regions);
> close(i915);
> + igt_i915_driver_unload();
> }
>
> igt_exit();
> --
> 2.34.1
>
