From 5c8f89f67c7b32014bc22421e48f3c0cf4e5ca3a Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Fri, 5 Oct 2018 09:03:52 +0100 Subject: igt/pm_rpm: Ignore modesets for basic tests with no KMS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If KMS is not available, we cannot simply turn on an output and expect that to wake the device up. As such we have to ignore that part of the basic subtest and simply proclaim victory if the device is able to sleep! v2: Mention that we can test wakeup via nop execbuf in future. Signed-off-by: Chris Wilson Reviewed-by: José Roberto de Souza --- tests/pm_rpm.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/tests/pm_rpm.c b/tests/pm_rpm.c index 7488efd7..f0d6db52 100644 --- a/tests/pm_rpm.c +++ b/tests/pm_rpm.c @@ -777,7 +777,10 @@ static void basic_subtest(void) { disable_all_screens_and_wait(&ms_data); - enable_one_screen_and_wait(&ms_data); + if (ms_data.res) + enable_one_screen_and_wait(&ms_data); + + /* XXX Also we can test wake up via exec nop */ } static void pc8_residency_subtest(void) @@ -1405,8 +1408,10 @@ static void pci_d3_state_subtest(void) disable_all_screens_and_wait(&ms_data); igt_assert(igt_wait(device_in_pci_d3(), 2000, 100)); - enable_one_screen_and_wait(&ms_data); - igt_assert(!device_in_pci_d3()); + if (ms_data.res) { + enable_one_screen_and_wait(&ms_data); + igt_assert(!device_in_pci_d3()); + } } static void __attribute__((noreturn)) stay_subtest(void) -- cgit v1.2.3