[Intel-gfx] [PATCH i-g-t] igt/pm_rpm: Skip counting modes if modprobed with disable_display

[Chris Wilson]

If we've explicitly disabled the display, we will never find any
connected outputs or modes. Checking for them will fail and report the
missing requirement instead.

v2: Sigh, avoid more comparisons against enabled displays
v3: Try occasionally compiling patches

Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
Cc: Imre Deak <imre.deak at intel.com>
Reviewed-by: Imre Deak <imre.deak at intel.com>
---
 tests/pm_rpm.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/tests/pm_rpm.c b/tests/pm_rpm.c
index fefcb1beb..bbe36e59e 100644
--- a/tests/pm_rpm.c
+++ b/tests/pm_rpm.c
@@ -2045,9 +2045,7 @@ int main(int argc, char *argv[])
 		igt_assert_eq(igt_i915_driver_load("disable_display=1"), 0);
 
 		igt_assert(setup_environment());
-		basic_subtest();
-		drm_resources_equal_subtest();
-		pci_d3_state_subtest();
+		igt_assert(igt_wait(device_in_pci_d3(), 2000, 100));
 		teardown_environment();
 
 		igt_debug("Reload as normal\n");
@@ -2055,9 +2053,9 @@ int main(int argc, char *argv[])
 		igt_assert_eq(igt_i915_driver_load(NULL), 0);
 
 		igt_assert(setup_environment());
-		basic_subtest();
-		drm_resources_equal_subtest();
-		pci_d3_state_subtest();
+		igt_assert(igt_wait(device_in_pci_d3(), 2000, 100));
+		if (enable_one_screen_with_type(&ms_data, SCREEN_TYPE_ANY))
+			drm_resources_equal_subtest();
 		teardown_environment();
 	}
 
-- 
2.18.0