From c2ddb81c460f95e0074c43687e4bb45fe893198f Mon Sep 17 00:00:00 2001 From: Lyude Date: Fri, 4 Nov 2016 16:27:12 -0400 Subject: igt_aux: Add igt_set_autoresume_delay() The default autoresume delay is about 5 seconds. It's possible on a system that's not very fast this might not be a long enough time, since an asynchronous hotplug event we scheduled on the chamelium that was intended to happen during suspend could happen before we actually manage to suspend. So, add a function that allows us to increase the autoresume time to ensure this never happens during suspend/resume tests with the chamelium. Cc: Tomeu Vizoso Signed-off-by: Lyude Changes since v1: - Use igt_require, not assert --- lib/igt_aux.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ lib/igt_aux.h | 1 + 2 files changed, 47 insertions(+) (limited to 'lib') diff --git a/lib/igt_aux.c b/lib/igt_aux.c index f323f6a2..763e997c 100644 --- a/lib/igt_aux.c +++ b/lib/igt_aux.c @@ -786,6 +786,52 @@ void igt_system_suspend_autoresume(enum igt_suspend_state state, close(power_dir); } +static int original_autoresume_delay; + +static void igt_restore_autoresume_delay(int sig) +{ + int delay_fd; + char delay_str[10]; + + igt_require((delay_fd = open("/sys/module/suspend/parameters/pm_test_delay", + O_WRONLY)) >= 0); + + snprintf(delay_str, sizeof(delay_str), "%d", original_autoresume_delay); + igt_require(write(delay_fd, delay_str, strlen(delay_str))); + + close(delay_fd); +} + +/** + * igt_set_autoresume_delay: + * @delay_secs: The delay in seconds before resuming the system + * + * Sets how long we wait to resume the system after suspending it, using the + * suspend.pm_test_delay variable. On exit, the original delay value is + * restored. + */ +void igt_set_autoresume_delay(int delay_secs) +{ + int delay_fd; + char delay_str[10]; + + igt_skip_on_simulation(); + + igt_require((delay_fd = open("/sys/module/suspend/parameters/pm_test_delay", + O_RDWR)) >= 0); + + if (!original_autoresume_delay) { + igt_require(read(delay_fd, delay_str, sizeof(delay_str))); + original_autoresume_delay = atoi(delay_str); + igt_install_exit_handler(igt_restore_autoresume_delay); + } + + snprintf(delay_str, sizeof(delay_str), "%d", delay_secs); + igt_require(write(delay_fd, delay_str, strlen(delay_str))); + + close(delay_fd); +} + /** * igt_drop_root: * diff --git a/lib/igt_aux.h b/lib/igt_aux.h index 30f914b9..cb54ca5e 100644 --- a/lib/igt_aux.h +++ b/lib/igt_aux.h @@ -183,6 +183,7 @@ enum igt_suspend_test { void igt_system_suspend_autoresume(enum igt_suspend_state state, enum igt_suspend_test test); +void igt_set_autoresume_delay(int delay_secs); /* dropping priviledges */ void igt_drop_root(void); -- cgit v1.2.3