tests/chamelium: Add common suspend and hibernate tests for DP and HDMI
PATCH v3 1/1 tests/chamelium: Add common suspend and hibernate tests for DP and HDMI
This adds two new tests: common-hpd-after-suspend and common-hpd-after-hibernate that are aimed at testing HPD change during suspend/hibernate for both DP and HDMI, at the same time.
The interest in bringing this test up is to reduce the time spent in testing, with the downside of less precision regarding the test's outcome. The per-connector tests are still available to get a more precise idea of which connector causes a failure, when that happens.
VGA is explicitly excluded from this test as there is currently no way of doing delayed hpd pulses for it.
The generic hpd suspend/resume test code is split in a dedicated function, that allow testing one or all possible ports.
--- tests/chamelium.c | 118 +++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 100 insertions(+), 18 deletions(-)
tests/chamelium.c +100 -18
@@ -143,8 +143,18 @@ wait_for_connector(data_t *data, struct chamelium_port *port,static void reset_state (data_t *data,struct chamelium_port *port) { +int p; +chamelium_reset (data->chamelium); -wait_for_connector (data, port,DRM_MODE_DISCONNECTED ); + +if (port) { +wait_for_connector (data, port,DRM_MODE_DISCONNECTED ); + }else { +for (p =0 ; p < data->port_count; p++) { + port = data->ports[p]; +wait_for_connector (data, port,DRM_MODE_DISCONNECTED ); + } + } } static void
@@ -206,36 +216,96 @@ test_edid_read(data_t *data, struct chamelium_port *port, }static void -test_suspend_resume_hpd (data_t *data,struct chamelium_port *port, -enum igt_suspend_state state, -enum igt_suspend_test test) +try_suspend_resume_hpd (data_t *data,struct chamelium_port *port, +enum igt_suspend_state state,enum igt_suspend_test test, +struct udev_monitor *mon,bool connected) { -struct udev_monitor *mon =igt_watch_hotplug (); - -reset_state (data, port); +int p;igt_set_autoresume_delay (SUSPEND_RESUME_DELAY );igt_flush_hotplugs (mon); -/* Make sure we notice new connectors after resuming */ -chamelium_async_hpd_pulse_start (data->chamelium, port, false, -SUSPEND_RESUME_DELAY /2 ); +if (port) { +chamelium_async_hpd_pulse_start (data->chamelium, port, + connected, +SUSPEND_RESUME_DELAY /2 ); + }else { +for (p =0 ; p < data->port_count; p++) { + port = data->ports[p]; +if (chamelium_port_get_type (port) ==DRM_MODE_CONNECTOR_VGA ) +continue ; + +chamelium_async_hpd_pulse_start (data->chamelium, port, + connected, +SUSPEND_RESUME_DELAY /2 ); + } + + port =NULL ; + } +igt_system_suspend_autoresume (state, test);chamelium_async_hpd_pulse_finish (data->chamelium);igt_assert (igt_hotplug_detected (mon,HOTPLUG_TIMEOUT )); -igt_assert_eq (reprobe_connector (data, port),DRM_MODE_CONNECTED ); +if (port) { +igt_assert_eq (reprobe_connector (data, port), connected ? +DRM_MODE_DISCONNECTED :DRM_MODE_CONNECTED ); + }else { +for (p =0 ; p < data->port_count; p++) { + port = data->ports[p]; +if (chamelium_port_get_type (port) ==DRM_MODE_CONNECTOR_VGA ) +continue ; + +igt_assert_eq (reprobe_connector (data, port), connected ? +DRM_MODE_DISCONNECTED : +DRM_MODE_CONNECTED ); + } -igt_flush_hotplugs (mon); + port =NULL ; + } +} + +static void +test_suspend_resume_hpd (data_t *data,struct chamelium_port *port, +enum igt_suspend_state state, +enum igt_suspend_test test) +{ +struct udev_monitor *mon =igt_watch_hotplug (); + +reset_state (data, port); + +/* Make sure we notice new connectors after resuming */ +try_suspend_resume_hpd (data, port, state, test, mon, false);/* Now make sure we notice disconnected connectors after resuming */ -chamelium_async_hpd_pulse_start (data->chamelium, port, true, -SUSPEND_RESUME_DELAY /2 ); -igt_system_suspend_autoresume (state, test); -chamelium_async_hpd_pulse_finish (data->chamelium); +try_suspend_resume_hpd (data, port, state, test, mon, true); -igt_assert (igt_hotplug_detected (mon,HOTPLUG_TIMEOUT )); -igt_assert_eq (reprobe_connector (data, port),DRM_MODE_DISCONNECTED ); +igt_cleanup_hotplug (mon); +} + +static void +test_suspend_resume_hpd_common (data_t *data,enum igt_suspend_state state, +enum igt_suspend_test test) +{ +struct udev_monitor *mon =igt_watch_hotplug (); +struct chamelium_port *port; +int p; + +for (p =0 ; p < data->port_count; p++) { + port = data->ports[p]; +if (chamelium_port_get_type (port) ==DRM_MODE_CONNECTOR_VGA ) +continue ; + +igt_debug ("Testing port %s\n" ,chamelium_port_get_name (port)); + } + +reset_state (data,NULL ); + +/* Make sure we notice new connectors after resuming */ +try_suspend_resume_hpd (data,NULL , state, test, mon, false); + +/* Now make sure we notice disconnected connectors after resuming */ +try_suspend_resume_hpd (data,NULL , state, test, mon, true);igt_cleanup_hotplug (mon); }
@@ -750,6 +820,18 @@ igt_maintest_hpd_without_ddc (&data, port); } + igt_subtest_group { + igt_subtest("common-hpd-after-suspend") +test_suspend_resume_hpd_common (&data, +SUSPEND_STATE_MEM , +SUSPEND_TEST_NONE ); + + igt_subtest("common-hpd-after-hibernate") +test_suspend_resume_hpd_common (&data, +SUSPEND_STATE_DISK , +SUSPEND_TEST_DEVICES ); + } + igt_fixture {close (data.drm_fd); }
Signature · 6 lines
2.13.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 10 lines · Paul Kocialkowski
This adds two new tests: common-hpd-after-suspend and common-hpd-after-hibernate that are aimed at testing HPD change during
suspend/hibernate for both DP and HDMI, at the same time.The interest in bringing this test up is to reduce the time spent in testing, with the downside of less precision regarding the test's outcome. The per-connector tests are still available to get a more precise idea of which connector causes a failure, when that happens.
Quoted 7 lines
VGA is explicitly excluded from this test as there is currently no way of doing delayed hpd pulses for it.
The generic hpd suspend/resume test code is split in a dedicated function, that allow testing one or all possible ports.
Signed-off-by Paul Kocialkowski <[email protected]>
Will push to git in just a little bit, thanks!
Quoted 185 lines
---
tests/chamelium.c | 118
+++++++++++++++++++++++++++++++++++++++++++++---------1 file changed, 100 insertions(+), 18 deletions(-)tests/chamelium.c +0
-0@@ -143,8 +143,18 @@ wait_for_connector(data_t *data, struct chamelium_port *port,static void
reset_state(data_t *data, structchamelium_port*port) {tests/chamelium.c +2
-0+int p; +
chamelium_reset(data->chamelium);tests/chamelium.c +3
-1-wait_for_connector (data, port,DRM_MODE_DISCONNECTED ); + +if (port) { + wait_for_connector(data, port,
DRM_MODE_DISCONNECTED);tests/chamelium.c +4
-0+ }else { +for (p =0 ; p < data->port_count; p++) { + port = data->ports[p]; + wait_for_connector(data, port,
DRM_MODE_DISCONNECTED);tests/chamelium.c +2
-0+ } + }}
static voidtests/chamelium.c +0
-0@@ -206,36 +216,96 @@ test_edid_read(data_t *data, struct chamelium_port *port, }
static voidtests/chamelium.c +2
-3-test_suspend_resume_hpd(data_t *data, struct chamelium_port *port, - enum igt_suspend_state state, - enum igt_suspend_test test) +try_suspend_resume_hpd(data_t *data, struct chamelium_port *port, + enum igt_suspend_state state, enum
igt_suspend_testtest,tests/chamelium.c +1
-0+ struct udev_monitor *mon, bool connected){
tests/chamelium.c +1
-3-struct udev_monitor *mon =igt_watch_hotplug (); - -reset_state (data, port); +int p;
igt_set_autoresume_delay(SUSPEND_RESUME_DELAY);igt_flush_hotplugs(mon);tests/chamelium.c +0
-2-/* Make sure we notice new connectors after resuming */ - chamelium_async_hpd_pulse_start(data->chamelium, port,false,
tests/chamelium.c +2
-1- SUSPEND_RESUME_DELAY / 2); +if (port) { + chamelium_async_hpd_pulse_start(data->chamelium,port,
tests/chamelium.c +2
-0+ connected, +SUSPEND_RESUME_DELAY / 2);
tests/chamelium.c +4
-0+ }else { +for (p =0 ; p < data->port_count; p++) { + port = data->ports[p]; + if (chamelium_port_get_type(port) ==
DRM_MODE_CONNECTOR_VGA)tests/chamelium.c +3
-0+continue ; + + chamelium_async_hpd_pulse_start(data-Quoted 1 line
chamelium, port,
tests/chamelium.c +2
-0+ connected, +SUSPEND_RESU
ME_DELAY/ 2);tests/chamelium.c +5
-0+ } + + port =NULL ; + } +
igt_system_suspend_autoresume(state, test);chamelium_async_hpd_pulse_finish(data->chamelium);
igt_assert(igt_hotplug_detected(mon, HOTPLUG_TIMEOUT));tests/chamelium.c +0
-1- igt_assert_eq(reprobe_connector(data, port),
DRM_MODE_CONNECTED);tests/chamelium.c +2
-0+if (port) { + igt_assert_eq(reprobe_connector(data, port),connected ?
tests/chamelium.c +1
-0+ DRM_MODE_DISCONNECTED :
DRM_MODE_CONNECTED);tests/chamelium.c +4
-0+ }else { +for (p =0 ; p < data->port_count; p++) { + port = data->ports[p]; + if (chamelium_port_get_type(port) ==
DRM_MODE_CONNECTOR_VGA)tests/chamelium.c +3
-0+continue ; + + igt_assert_eq(reprobe_connector(data, port),connected ?
tests/chamelium.c +3
-0+ DRM_MODE_DISCONNECTED : + DRM_MODE_CONNECTED); + }tests/chamelium.c +15
-1-igt_flush_hotplugs (mon); + port =NULL ; + } +} + +static void +test_suspend_resume_hpd (data_t *data,struct chamelium_port *port, +enum igt_suspend_state state, +enum igt_suspend_test test) +{ +struct udev_monitor *mon =igt_watch_hotplug (); + +reset_state (data, port); + +/* Make sure we notice new connectors after resuming */ +try_suspend_resume_hpd (data, port, state, test, mon, false);
/* Now make sure we notice disconnected connectors after resuming */tests/chamelium.c +1
-4-chamelium_async_hpd_pulse_start (data->chamelium, port, true, -SUSPEND_RESUME_DELAY /2 ); -igt_system_suspend_autoresume (state, test); -chamelium_async_hpd_pulse_finish (data->chamelium); +try_suspend_resume_hpd (data, port, state, test, mon, true);tests/chamelium.c +0
-2-igt_assert (igt_hotplug_detected (mon,HOTPLUG_TIMEOUT )); - igt_assert_eq(reprobe_connector(data, port),
DRM_MODE_DISCONNECTED);tests/chamelium.c +5
-0+igt_cleanup_hotplug (mon); +} + +static void +test_suspend_resume_hpd_common(data_t *data, enum igt_suspend_statestate,
tests/chamelium.c +9
-0+ enum igt_suspend_test test) +{ +struct udev_monitor *mon =igt_watch_hotplug (); +struct chamelium_port *port; +int p; + +for (p =0 ; p < data->port_count; p++) { + port = data->ports[p]; + if (chamelium_port_get_type(port) ==
DRM_MODE_CONNECTOR_VGA)tests/chamelium.c +3
-0+continue ; + + igt_debug("Testing port %s\n",
chamelium_port_get_name(port));tests/chamelium.c +8
-0+ } + +reset_state (data,NULL ); + +/* Make sure we notice new connectors after resuming */ +try_suspend_resume_hpd (data,NULL , state, test, mon, false); + +/* Now make sure we notice disconnected connectors after resuming */
tests/chamelium.c +1
-0+try_suspend_resume_hpd (data,NULL , state, test, mon, true);
igt_cleanup_hotplug(mon);
}tests/chamelium.c +0
-0@@ -750,6 +820,18 @@ igt_main test_hpd_without_ddc(&data, port); }tests/chamelium.c +4
-0+ igt_subtest_group { + igt_subtest("common-hpd-after-suspend") +test_suspend_resume_hpd_common (&data, + SUSPEND_STATE
_MEM,tests/chamelium.c +1
-0+ SUSPEND_TEST_NONE);
tests/chamelium.c +4
-0+ + igt_subtest("common-hpd-after-hibernate") +test_suspend_resume_hpd_common (&data, + SUSPEND_STATE
_DISK,tests/chamelium.c +1
-0+ SUSPEND_TEST_DEVICES);
tests/chamelium.c +2
-0+ } +
Quoted 3 lines
igt_fixture{
close(data.drm_fd);
}
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx