diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2018-08-16 15:15:36 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2018-08-16 16:46:07 +0100 |
| commit | 2a5777f8a694f1f8edcf021afb1ef36192c6762d (patch) | |
| tree | 2345424381e3dfa15a1f95c854c16feb5cdaa05c | |
| parent | 1598fdb717546e25e8077935daa8e97768ad245d (diff) | |
igt/pm_rpm: Skip counting modes if modprobed with disable_display
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@chris-wilson.co.uk>
Cc: Imre Deak <imre.deak@intel.com>
Reviewed-by: Imre Deak <imre.deak@intel.com>
| -rw-r--r-- | tests/pm_rpm.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/tests/pm_rpm.c b/tests/pm_rpm.c index fefcb1be..bbe36e59 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(); } |