lib/igt_aux: Use provided autoresume delay for rtc wake
PATCH v2 2/7 chamelium: Add support for HPD toggle scheduling instead of async pulses
In reply to Paul KocialkowskiThis adds support for the newly-introduced ScheduleHpdToggle XMLRPC method of the Chamelium's interface and makes use of it instead of starting pulses with an asynchronous call, suspending and dealing with the result at resume.
The XMLRPC library does not guarantee that the call will be made before caring for its outcome and this is in fact what was happening:
the call was being delayed until resume time, as can be seen from the Chamelium's logs. The quite generous timeout for HPD event detection would then catch the toggle, that was sent after resume.
This is especially useful for testing HPD during suspend/resume.
--- lib/igt_chamelium.c | 78 ++++++++++------------------------------------------- lib/igt_chamelium.h | 7 +++-- tests/chamelium.c | 13 +++++---- 3 files changed, 23 insertions(+), 75 deletions(-)
lib/igt_chamelium.c +14 -64
@@ -447,76 +447,26 @@ void chamelium_fire_mixed_hpd_pulses(struct chamelium *chamelium,xmlrpc_DECREF (pulse_widths); } -static void async_rpc_handler (const char *server_url,const char *method_name, -xmlrpc_value *param_array,void *user_data, -xmlrpc_env *fault,xmlrpc_value *result) -{ -/* We don't care about the responses */ -} -/** -* chamelium_async_hpd_pulse_start: +* chamelium_schedule_hpd_toggle: * @chamelium: The Chamelium instance to use * @port: The port to fire the HPD pulses on -* @high: Whether to fire a high pulse (e.g. simulate a connect), or a low -* pulse (e.g. simulate a disconnect) -* @delay_secs: How long to wait before sending the HPD pulse. -* -* Instructs the chamelium to send an hpd pulse after @delay_secs seconds have -* passed, without waiting for the chamelium to finish. This is useful for -* testing things such as hpd after a suspend/resume cycle, since we can't tell -* the chamelium to send a hotplug at the same time that our system is -* suspended. -* -* It is required that the user eventually call -* #chamelium_async_hpd_pulse_finish, to clean up the leftover XML-RPC -* responses from the chamelium. -*/ -void chamelium_async_hpd_pulse_start (struct chamelium *chamelium, -struct chamelium_port *port, -bool high,int delay_secs) -{ -xmlrpc_value *pulse_widths =xmlrpc_array_new (&chamelium->env), *width; - -/* TODO: Actually implement something in the chameleon server to allow -* for delayed actions such as hotplugs. This would work a bit better -* and allow us to test suspend/resume on ports without hpd like VGA -*/ - -igt_debug ("Sending HPD pulse (%s) on %s with %d second delay\n" , - high ?"high->low" :"low->high" , port->name, delay_secs); - -/* If we're starting at high, make the first pulse width 0 so we keep -* the port connected */ -if (high) { - width =xmlrpc_int_new (&chamelium->env,0 ); -xmlrpc_array_append_item (&chamelium->env, pulse_widths, width); -xmlrpc_DECREF (width); - } - - width =xmlrpc_int_new (&chamelium->env, delay_secs *1000 ); -xmlrpc_array_append_item (&chamelium->env, pulse_widths, width); -xmlrpc_DECREF (width); - -xmlrpc_client_start_rpcf (&chamelium->env, chamelium->client, - chamelium->url, -"FireMixedHpdPulses" , async_rpc_handler,NULL , -"(iA)" , port->id, pulse_widths); -xmlrpc_DECREF (pulse_widths); -} - -/** -* chamelium_async_hpd_pulse_finish: -* @chamelium: The Chamelium instance to use +* @delay_ms: Delay in milli-second before the toggle takes place +* @rising_edge: Whether the toggle should be a rising edge or a falling edge * -* Waits for any asynchronous RPC started by #chamelium_async_hpd_pulse_start -* to complete, and then cleans up any leftover responses from the chamelium. -* If all of the RPC calls have already completed, this function returns -* immediately. +* Instructs the chamelium to schedule an hpd toggle (either a rising edge or +* a falling edge, depending on @rising_edg) after @delay_ms have passed. +* This is useful for testing things such as hpd after a suspend/resume cycle. */ -void chamelium_async_hpd_pulse_finish (struct chamelium *chamelium) +void chamelium_schedule_hpd_toggle (struct chamelium *chamelium, +struct chamelium_port *port,int delay_ms, +bool rising_edge) { -xmlrpc_client_event_loop_finish (chamelium->client); +igt_debug ("Scheduling HPD toggle on %s in %d ms\n" , port->name, + delay_ms); + +xmlrpc_DECREF (chamelium_rpc (chamelium,NULL ,"ScheduleHpdToggle" , +"(iii)" , port->id, delay_ms, rising_edge)); }/**
lib/igt_chamelium.h +3 -4
@@ -61,10 +61,9 @@ void chamelium_fire_mixed_hpd_pulses(struct chamelium *chamelium,void chamelium_fire_hpd_pulses (struct chamelium *chamelium,struct chamelium_port *port,int width_msec,int count); -void chamelium_async_hpd_pulse_start (struct chamelium *chamelium, -struct chamelium_port *port, -bool high,int delay_secs); -void chamelium_async_hpd_pulse_finish (struct chamelium *chamelium); +void chamelium_schedule_hpd_toggle (struct chamelium *chamelium, +struct chamelium_port *port,int delay_ms, +bool rising_edge);int chamelium_new_edid (struct chamelium *chamelium,const unsigned char *edid);void chamelium_port_set_edid (struct chamelium *chamelium,struct chamelium_port *port,int edid_id);
tests/chamelium.c +6 -7
@@ -226,25 +226,24 @@ try_suspend_resume_hpd(data_t *data, struct chamelium_port *port,igt_flush_hotplugs (mon);if (port) { -chamelium_async_hpd_pulse_start (data->chamelium, port, - connected, -SUSPEND_RESUME_DELAY /2 ); +chamelium_schedule_hpd_toggle (data->chamelium, port, +SUSPEND_RESUME_DELAY *1000 /2 , + !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 ; -chamelium_async_hpd_pulse_start (data->chamelium, port, - connected, -SUSPEND_RESUME_DELAY /2 ); +chamelium_schedule_hpd_toggle (data->chamelium, port, +SUSPEND_RESUME_DELAY *1000 /2 , + !connected); } port =NULL ; }igt_system_suspend_autoresume (state, test); -chamelium_async_hpd_pulse_finish (data->chamelium);igt_assert (igt_hotplug_detected (mon,HOTPLUG_TIMEOUT ));if (port) {
Signature · 6 lines
2.13.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 1/7 lib/igt_aux: Use provided autoresume delay for rtc wake
This stores the autoresume delay provided via igt_set_autoresume_delay for use during suspend via rtc wake scheduling. This delay was previously only used for pm_test suspendm while the function suggests it should be applied to all autoresume cases.
There is also definitely a use case for configuring the rtc wake delay, so this implements it.
--- lib/igt_aux.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
lib/igt_aux.c +8 -1
@@ -680,6 +680,8 @@ void igt_cleanup_aperture_trashers(void)free (trash_bos); } +static int autoresume_delay; +static const char *suspend_state_name[] = { [SUSPEND_STATE_FREEZE ] ="freeze" , [SUSPEND_STATE_STANDBY ] ="standby" ,
@@ -746,7 +748,10 @@ static void suspend_via_rtcwake(enum igt_suspend_state state)igt_assert (state <SUSPEND_STATE_NUM ); - delay = state ==SUSPEND_STATE_DISK ?30 :15 ; +if (autoresume_delay) + delay = autoresume_delay; +else + delay = state ==SUSPEND_STATE_DISK ?30 :15 ;/* * Skip if rtcwake would fail for a reason not related to the kernel's
@@ -889,6 +894,8 @@ void igt_set_autoresume_delay(int delay_secs)igt_require (write (delay_fd, delay_str,strlen (delay_str)));close (delay_fd); + + autoresume_delay = delay_secs; }/**
Signature · 6 lines
2.13.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 3/7 tests/chamelium: Add VGA HPD toggle tests after suspend and hibernate
This adds HPD toggle after suspend and hibernate testing for VGA, in the same fashion as currently done for DP and HDMI and includes VGA in the common suspend and hibernate test.
--- tests/chamelium.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-)
tests/chamelium.c +9 -13
@@ -232,9 +232,6 @@ try_suspend_resume_hpd(data_t *data, struct chamelium_port *port, }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_schedule_hpd_toggle (data->chamelium, port,SUSPEND_RESUME_DELAY *1000 /2 , !connected);
@@ -252,9 +249,6 @@ try_suspend_resume_hpd(data_t *data, struct chamelium_port *port, }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 );
@@ -292,9 +286,6 @@ test_suspend_resume_hpd_common(data_t *data, enum igt_suspend_state state,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)); }
@@ -810,10 +801,15 @@ igt_main igt_kms_get_alt_edid()); } -/* FIXME: Right now there isn't a way to do any sort of delayed -* psuedo-hotplug with VGA, so testing detection after a -* suspend/resume cycle isn't possible yet -*/ + connector_subtest("vga-hpd-after-suspend", VGA) +test_suspend_resume_hpd (&data, port, +SUSPEND_STATE_MEM , +SUSPEND_TEST_NONE ); + + connector_subtest("vga-hpd-after-hibernate", VGA) +test_suspend_resume_hpd (&data, port, +SUSPEND_STATE_DISK , +SUSPEND_TEST_DEVICES ); connector_subtest("vga-hpd-without-ddc", VGA)test_hpd_without_ddc (&data, port);
Signature · 6 lines
2.13.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 4/7 tests/chamelium: Reduce the simple hotplug test toggle count for VGA
In reply to Paul KocialkowskiSince VGA hpd detection is done through RGB lines load detection and nowadays often goes through a bridge to some digital interface, HPD detection usually takes a while (up to a couple seconds).
Thus, it is not as relevant to stress it as many as 15 times. This brings the toggle count down to 5 times, which makes the test run a lot faster without really changing the outcome much.
--- tests/chamelium.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)
tests/chamelium.c +10 -5
@@ -47,6 +47,9 @@ typedef struct {#define HPD_STORM_PULSE_INTERVAL_DP 100/* ms */ #define HPD_STORM_PULSE_INTERVAL_HDMI 200/* ms */ +#define HPD_TOGGLE_COUNT_VGA 5 +#define HPD_TOGGLE_COUNT_DP_HDMI 15 +/* Pre-calculated CRCs for the pattern fb, for all the modes in the default * chamelium edid */
@@ -158,7 +161,7 @@ reset_state(data_t *data, struct chamelium_port *port) }static void -test_basic_hotplug (data_t *data,struct chamelium_port *port) +test_basic_hotplug (data_t *data,struct chamelium_port *port,int toggle_count) {struct udev_monitor *mon =igt_watch_hotplug ();int i;
@@ -166,7 +169,7 @@ test_basic_hotplug(data_t *data, struct chamelium_port *port)reset_state (data,NULL );igt_hpd_storm_set_threshold (data->drm_fd,0 ); -for (i =0 ; i <15 ; i++) { +for (i =0 ; i < toggle_count; i++) {igt_flush_hotplugs (mon);/* Check if we get a sysfs hotplug event */
@@ -680,7 +683,8 @@ igt_main } connector_subtest("dp-hpd", DisplayPort) -test_basic_hotplug (&data, port); +test_basic_hotplug (&data, port, +HPD_TOGGLE_COUNT_DP_HDMI ); connector_subtest("dp-edid-read", DisplayPort) { test_edid_read(&data, port, edid_id,
@@ -736,7 +740,8 @@ igt_main } connector_subtest("hdmi-hpd", HDMIA) -test_basic_hotplug (&data, port); +test_basic_hotplug (&data, port, +HPD_TOGGLE_COUNT_DP_HDMI ); connector_subtest("hdmi-edid-read", HDMIA) { test_edid_read(&data, port, edid_id,
@@ -792,7 +797,7 @@ igt_main } connector_subtest("vga-hpd", VGA) -test_basic_hotplug (&data, port); +test_basic_hotplug (&data, port,HPD_TOGGLE_COUNT_VGA ); connector_subtest("vga-edid-read", VGA) { test_edid_read(&data, port, edid_id,
Signature · 6 lines
2.13.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 5/7 tests/chamelium: Update connector state without reprobe when possible
In reply to Paul KocialkowskiThis renames the reprobe_connector function to update_connector and ensures that full reprobe of the connector is only done when really necessary (e.g. when changing the EDID).
A full reprobe takes time and is not required for updating the connector state. Thus, this allows executing tests faster.
--- tests/chamelium.c | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-)
tests/chamelium.c +18 -16
@@ -103,13 +103,14 @@ require_connector_present(data_t *data, unsigned int type) }static drmModeConnection -reprobe_connector (data_t *data,struct chamelium_port *port) +update_connector (data_t *data,struct chamelium_port *port,bool reprobe) {drmModeConnector *connector;drmModeConnection status; -igt_debug ("Reprobing %s...\n" ,chamelium_port_get_name (port)); - connector =chamelium_port_get_connector (data->chamelium, port, true); +igt_debug ("Updating %s...\n" ,chamelium_port_get_name (port)); + connector =chamelium_port_get_connector (data->chamelium, port, + reprobe);igt_assert (connector); status = connector->connection;
@@ -119,7 +120,7 @@ reprobe_connector(data_t *data, struct chamelium_port *port)static void wait_for_connector (data_t *data,struct chamelium_port *port, -drmModeConnection status) +drmModeConnection status,bool reprobe) {bool finished = false;
@@ -132,7 +133,7 @@ wait_for_connector(data_t *data, struct chamelium_port *port,* that hpd events work in the event that hpd doesn't work on the system */ igt_until_timeout (HOTPLUG_TIMEOUT ) { -if (reprobe_connector (data, port) == status) { +if (update_connector (data, port, reprobe) == status) { finished = true;return ; }
@@ -151,11 +152,12 @@ reset_state(data_t *data, struct chamelium_port *port)chamelium_reset (data->chamelium);if (port) { -wait_for_connector (data, port,DRM_MODE_DISCONNECTED ); +wait_for_connector (data, port,DRM_MODE_DISCONNECTED , false); }else {for (p =0 ; p < data->port_count; p++) { port = data->ports[p]; -wait_for_connector (data, port,DRM_MODE_DISCONNECTED ); +wait_for_connector (data, port,DRM_MODE_DISCONNECTED , + false); } } }
@@ -175,7 +177,7 @@ test_basic_hotplug(data_t *data, struct chamelium_port *port, int toggle_count)/* Check if we get a sysfs hotplug event */ chamelium_plug (data->chamelium, port);igt_assert (igt_hotplug_detected (mon,HOTPLUG_TIMEOUT )); -igt_assert_eq (reprobe_connector (data, port), +igt_assert_eq (update_connector (data, port, false),DRM_MODE_CONNECTED );igt_flush_hotplugs (mon);
@@ -183,7 +185,7 @@ test_basic_hotplug(data_t *data, struct chamelium_port *port, int toggle_count)/* Now check if we get a hotplug from disconnection */ chamelium_unplug (data->chamelium, port);igt_assert (igt_hotplug_detected (mon,HOTPLUG_TIMEOUT )); -igt_assert_eq (reprobe_connector (data, port), +igt_assert_eq (update_connector (data, port, false),DRM_MODE_DISCONNECTED ); }
@@ -204,7 +206,7 @@ test_edid_read(data_t *data, struct chamelium_port *port,chamelium_port_set_edid (data->chamelium, port, edid_id);chamelium_plug (data->chamelium, port); -wait_for_connector (data, port,DRM_MODE_CONNECTED ); +wait_for_connector (data, port,DRM_MODE_CONNECTED , true); igt_assert(kmstest_get_property(data->drm_fd, connector->connector_id, DRM_MODE_OBJECT_CONNECTOR, "EDID", NULL,
@@ -247,13 +249,13 @@ try_suspend_resume_hpd(data_t *data, struct chamelium_port *port,igt_assert (igt_hotplug_detected (mon,HOTPLUG_TIMEOUT ));if (port) { -igt_assert_eq (reprobe_connector (data, port), connected ? +igt_assert_eq (update_connector (data, port, false), connected ?DRM_MODE_DISCONNECTED :DRM_MODE_CONNECTED ); }else {for (p =0 ; p < data->port_count; p++) { port = data->ports[p]; -igt_assert_eq (reprobe_connector (data, port), connected ? -DRM_MODE_DISCONNECTED : +igt_assert_eq (update_connector (data, port, false), + connected ?DRM_MODE_DISCONNECTED :DRM_MODE_CONNECTED ); }
@@ -317,7 +319,7 @@ test_suspend_resume_edid_change(data_t *data, struct chamelium_port *port,/* First plug in the port */ chamelium_port_set_edid (data->chamelium, port, edid_id);chamelium_plug (data->chamelium, port); -wait_for_connector (data, port,DRM_MODE_CONNECTED ); +wait_for_connector (data, port,DRM_MODE_CONNECTED , true);igt_flush_hotplugs (mon);
@@ -352,7 +354,7 @@ prepare_output(data_t *data,chamelium_port_set_edid (data->chamelium, port, data->edid_id);chamelium_plug (data->chamelium, port); -wait_for_connector (data, port,DRM_MODE_CONNECTED ); +wait_for_connector (data, port,DRM_MODE_CONNECTED , true);igt_display_init (display, data->drm_fd); output =igt_output_from_connector (display, connector);
@@ -590,7 +592,7 @@ test_hpd_without_ddc(data_t *data, struct chamelium_port *port)chamelium_plug (data->chamelium, port);igt_assert (igt_hotplug_detected (mon,HOTPLUG_TIMEOUT )); -igt_assert_eq (reprobe_connector (data, port),DRM_MODE_CONNECTED ); +igt_assert_eq (update_connector (data, port, false),DRM_MODE_CONNECTED );igt_cleanup_hotplug (mon); }
Signature · 6 lines
2.13.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 6/7 tests/chamelium: Disconnect connectors without extra reset
In reply to Paul KocialkowskiThis removes the reset call from the reset_state function and renames it to disconnect_connector. Since a call to reset is already done in chamelium_init, there is no need to do an extra reset in each test.
This allows reducing the execution time a bit.
--- tests/chamelium.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)
tests/chamelium.c +11 -11
@@ -145,17 +145,17 @@ wait_for_connector(data_t *data, struct chamelium_port *port, }static void -reset_state (data_t *data,struct chamelium_port *port) +disconnect_connector (data_t *data,struct chamelium_port *port) {int p; -chamelium_reset (data->chamelium); -if (port) { +chamelium_unplug (data->chamelium, port);wait_for_connector (data, port,DRM_MODE_DISCONNECTED , false); }else {for (p =0 ; p < data->port_count; p++) { port = data->ports[p]; +chamelium_unplug (data->chamelium, port);wait_for_connector (data, port,DRM_MODE_DISCONNECTED , false); }
@@ -168,7 +168,7 @@ test_basic_hotplug(data_t *data, struct chamelium_port *port, int toggle_count)struct udev_monitor *mon =igt_watch_hotplug ();int i; -reset_state (data,NULL ); +disconnect_connector (data,NULL );igt_hpd_storm_set_threshold (data->drm_fd,0 );for (i =0 ; i < toggle_count; i++) {
@@ -202,7 +202,7 @@ test_edid_read(data_t *data, struct chamelium_port *port, data->chamelium, port, false);uint64_t edid_blob_id; -reset_state (data, port); +disconnect_connector (data, port);chamelium_port_set_edid (data->chamelium, port, edid_id);chamelium_plug (data->chamelium, port);
@@ -270,7 +270,7 @@ test_suspend_resume_hpd(data_t *data, struct chamelium_port *port, {struct udev_monitor *mon =igt_watch_hotplug (); -reset_state (data, port); +disconnect_connector (data, port);/* Make sure we notice new connectors after resuming */ try_suspend_resume_hpd (data, port, state, test, mon, false);
@@ -294,7 +294,7 @@ test_suspend_resume_hpd_common(data_t *data, enum igt_suspend_state state,igt_debug ("Testing port %s\n" ,chamelium_port_get_name (port)); } -reset_state (data,NULL ); +disconnect_connector (data,NULL );/* Make sure we notice new connectors after resuming */ try_suspend_resume_hpd (data,NULL , state, test, mon, false);
@@ -314,7 +314,7 @@ test_suspend_resume_edid_change(data_t *data, struct chamelium_port *port, {struct udev_monitor *mon =igt_watch_hotplug (); -reset_state (data, port); +disconnect_connector (data, port);/* First plug in the port */ chamelium_port_set_edid (data->chamelium, port, edid_id);
@@ -582,7 +582,7 @@ test_hpd_without_ddc(data_t *data, struct chamelium_port *port) {struct udev_monitor *mon =igt_watch_hotplug (); -reset_state (data, port); +disconnect_connector (data, port);igt_flush_hotplugs (mon);/* Disable the DDC on the connector and make sure we still get a
@@ -604,7 +604,7 @@ test_hpd_storm_detect(data_t *data, struct chamelium_port *port, int width)int count =0 ;igt_require_hpd_storm_ctl (data->drm_fd); -reset_state (data, port); +disconnect_connector (data, port);igt_hpd_storm_set_threshold (data->drm_fd,1 );chamelium_fire_hpd_pulses (data->chamelium, port, width,10 );
@@ -629,7 +629,7 @@ static void test_hpd_storm_disable(data_t *data, struct chamelium_port *port, int width) {igt_require_hpd_storm_ctl (data->drm_fd); -reset_state (data, port); +disconnect_connector (data, port);igt_hpd_storm_set_threshold (data->drm_fd,0 ); chamelium_fire_hpd_pulses(data->chamelium, port,
Signature · 6 lines
2.13.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 7/7 Make igtrc configuration common, with configurable suspend/resume delay
In reply to Paul KocialkowskiThis adds support for configurable suspend/resume delay and takes the occasion to move igtrc configuation from igt_chamelium to igt_core. This way, suspend/resume delay configuration can be used for all tests.
--- lib/Makefile.am | 2 ++ lib/igt_aux.c | 27 ++++++++++++++++++---- lib/igt_aux.h | 1 + lib/igt_chamelium.c | 49 +++++++++------------------------------- lib/igt_core.c | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++++ lib/igt_core.h | 2 ++ tests/Makefile.am | 4 ++-- tests/chamelium.c | 11 +++++---- tools/Makefile.am | 4 ++-- 9 files changed, 112 insertions(+), 52 deletions(-)
lib/Makefile.am +2 -0
@@ -41,6 +41,7 @@ AM_CFLAGS = \ $(XMLRPC_CFLAGS) \ $(LIBUDEV_CFLAGS) \ $(PIXMAN_CFLAGS) \ + $(GLIB_CFLAGS) \ $(VALGRIND_CFLAGS) \ -DIGT_SRCDIR=\""$(abs_top_srcdir)/tests"\" \ -DIGT_DATADIR=\""$(pkgdatadir)"\" \
@@ -61,5 +62,6 @@ libintel_tools_la_LIBADD = \ $(XMLRPC_LIBS) \ $(LIBUDEV_LIBS) \ $(PIXMAN_LIBS) \ + $(GLIB_LIBS) \ -lm
lib/igt_aux.c +23 -4
@@ -748,10 +748,7 @@ static void suspend_via_rtcwake(enum igt_suspend_state state)igt_assert (state <SUSPEND_STATE_NUM ); -if (autoresume_delay) - delay = autoresume_delay; -else - delay = state ==SUSPEND_STATE_DISK ?30 :15 ; + delay =igt_get_autoresume_delay (state);/* * Skip if rtcwake would fail for a reason not related to the kernel's
@@ -899,6 +896,28 @@ void igt_set_autoresume_delay(int delay_secs) }/** +* igt_get_autoresume_delay: +* @state: an #igt_suspend_state, the target suspend state +* +* Retrieves how long we wait to resume the system after suspending it. +* This can either be set through igt_set_autoresume_delay or be a default +* value that depends on the suspend state. +* +* Returns: The autoresume delay, in seconds. +*/ +int igt_get_autoresume_delay (enum igt_suspend_state state) +{ +int delay; + +if (autoresume_delay) + delay = autoresume_delay; +else + delay = state ==SUSPEND_STATE_DISK ?30 :15 ; + +return delay; +} + +/** * igt_drop_root: * * Drop root privileges and make sure it actually worked. Useful for tests
lib/igt_aux.h +1 -0
@@ -192,6 +192,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); +int igt_get_autoresume_delay (enum igt_suspend_state state);/* dropping priviledges */ void igt_drop_root (void );
lib/igt_chamelium.c +11 -38
95 lines not on this page · raw message
lib/igt_core.c +64 -0
107 lines not on this page · raw message
lib/igt_core.h +2 -0
@@ -40,6 +40,7 @@#include <stdarg.h> #include <getopt.h> #include <unistd.h> +#include <glib.h> #ifndef IGT_LOG_DOMAIN #define IGT_LOG_DOMAIN (NULL)
@@ -48,6 +49,7 @@ extern const char* __igt_test_description __attribute__((weak));extern bool __igt_plain_output; +extern GKeyFile *igt_key_file;/**
tests/Makefile.am +2 -2
@@ -72,9 +72,9 @@ AM_CFLAGS = $(DRM_CFLAGS) $(CWARNFLAGS) -Wno-unused-result $(DEBUG_CFLAGS)\ $(LIBUNWIND_CFLAGS) $(WERROR_CFLAGS) \ $(NULL) -LDADD = ../lib/libintel_tools.la $(GLIB_LIBS) $(XMLRPC_LIBS) +LDADD = ../lib/libintel_tools.la $(XMLRPC_LIBS) -AM_CFLAGS += $(CAIRO_CFLAGS) $(LIBUDEV_CFLAGS) $(GLIB_CFLAGS) +AM_CFLAGS += $(CAIRO_CFLAGS) $(LIBUDEV_CFLAGS) AM_LDFLAGS = -Wl,--as-needed drm_import_export_CFLAGS = $(AM_CFLAGS) $(THREAD_CFLAGS)
tests/chamelium.c +5 -6
@@ -42,7 +42,6 @@ typedef struct { } data_t;#define HOTPLUG_TIMEOUT 20/* seconds */ -#define SUSPEND_RESUME_DELAY 20/* seconds */ #define HPD_STORM_PULSE_INTERVAL_DP 100/* ms */ #define HPD_STORM_PULSE_INTERVAL_HDMI 200/* ms */
@@ -225,21 +224,21 @@ 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) { + int delay;int p; -igt_set_autoresume_delay (SUSPEND_RESUME_DELAY );igt_flush_hotplugs (mon); + delay =igt_get_autoresume_delay (state) *1000 /2 ; +if (port) { -chamelium_schedule_hpd_toggle (data->chamelium, port, -SUSPEND_RESUME_DELAY *1000 /2 , +chamelium_schedule_hpd_toggle (data->chamelium, port, delay, !connected); }else {for (p =0 ; p < data->port_count; p++) { port = data->ports[p];chamelium_schedule_hpd_toggle (data->chamelium, port, -SUSPEND_RESUME_DELAY *1000 /2 , - !connected); + delay, !connected); } port =NULL ;
tools/Makefile.am +2 -2
@@ -9,8 +9,8 @@ endif if HAVE_UDEV bin_PROGRAMS += intel_dp_compliance -intel_dp_compliance_CFLAGS = $(AM_CFLAGS) $(GLIB_CFLAGS) -intel_dp_compliance_LDADD = $(top_builddir)/lib/libintel_tools.la $(GLIB_LIBS) +intel_dp_compliance_CFLAGS = $(AM_CFLAGS) +intel_dp_compliance_LDADD = $(top_builddir)/lib/libintel_tools.la endif SUBDIRS = null_state_gen registers
Signature · 6 lines
2.13.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH i-g-t v2 7/7] Make igtrc configuration common, with configurable suspend/resume delay
Quoted 282 lines · Paul Kocialkowski
This adds support for configurable suspend/resume delay and takes the occasion to move igtrc configuation from
igt_chameliumtoigt_core. This way, suspend/resume delay configuration can be used for all tests.Signed-off-by Paul Kocialkowski <[email protected]>---
lib/Makefile.am | 2 ++
lib/igt_aux.c | 27 ++++++++++++++++++---- lib/igt_aux.h | 1 +
lib/igt_chamelium.c | 49 +++++++++------------------------------- lib/igt_core.c | 64
+++++++++++++++++++++++++++++++++++++++++++++++++++++
lib/igt_core.h | 2 ++tests/Makefile.am | 4 ++-- tests/chamelium.c | 11 +++++---- tools/Makefile.am | 4 ++-- 9 files changed, 112 insertions(+), 52 deletions(-)lib/Makefile.am +2
-0@@ -41,6 +41,7 @@ AM_CFLAGS = \ $(XMLRPC_CFLAGS) \ $(LIBUDEV_CFLAGS) \ $(PIXMAN_CFLAGS) \ + $(GLIB_CFLAGS) \ $(VALGRIND_CFLAGS) \ -DIGT_SRCDIR=\""$(abs_top_srcdir)/tests"\" \ -DIGT_DATADIR=\""$(pkgdatadir)"\" \@@ -61,5 +62,6 @@ libintel_tools_la_LIBADD = \ $(XMLRPC_LIBS) \ $(LIBUDEV_LIBS) \ $(PIXMAN_LIBS) \ + $(GLIB_LIBS) \-lm
lib/igt_aux.c +0
-0@@ -748,10 +748,7 @@ static void suspend_via_rtcwake(enum igt_suspend_state state)
igt_assert(state < SUSPEND_STATE_NUM);lib/igt_aux.c +1
-4-if (autoresume_delay) - delay = autoresume_delay; -else - delay = state ==SUSPEND_STATE_DISK ?30 :15 ; + delay =igt_get_autoresume_delay (state);
/*
* Skip if rtcwake would fail for a reason not related to the kernel'slib/igt_aux.c +0
-0@@ -899,6 +896,28 @@ void igt_set_autoresume_delay(int delay_secs) }
/**
+ *igt_get_autoresume_delay:
+ * @state: an #igt_suspend_state, the target suspend state
+ *
+ * Retrieves how long we wait to resume the system after suspending it.
+ * This can either be set throughigt_set_autoresume_delayor be a default
+ * value that depends on the suspend state.
+ *
+ * Returns: The autoresume delay, in seconds.
+ */lib/igt_aux.c +13
-0+int igt_get_autoresume_delay (enum igt_suspend_state state) +{ +int delay; + +if (autoresume_delay) + delay = autoresume_delay; +else + delay = state ==SUSPEND_STATE_DISK ?30 :15 ; + +return delay; +} + +/** *
igt_drop_root:
*
* Drop root privileges and make sure it actually worked. Useful for testslib/igt_aux.h +1
-0@@ -192,6 +192,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); +int igt_get_autoresume_delay (enum igt_suspend_state state);
/* dropping priviledges */
voidigt_drop_root(void);lib/igt_chamelium.c +0
-0@@ -51,8 +51,8 @@ * [on the ChromeOS project page](https://www.chromium.org/chromium-os/testing/chamelium).
*
* In order to run tests using the Chamelium, a valid configuration file must be
- * present. The configuration file is a normal Glib keyfile (similar to Windows
- * INI) structured like so:
+ * present. It must contain Chamelium-specific keys as shown with the following
+ * example:
*
* |[<!-- language="plain" -->
* [Chamelium]lib/igt_chamelium.c +0
-1@@ -72,8 +72,6 @@ * ChameliumPortID=3 * ]| * - * By default, this file is expected to exist in ~/.igtrc . Thedirectory for
- * this can be overriden by setting the environment variable %IGT_CONFIG_PATH.
*/
structchamelium_edid{lib/igt_chamelium.c +0
-0@@ -1034,7 +1032,7 @@ static unsigned int chamelium_get_port_type(struct chamelium *chamelium, }
static bool chamelium_read_port_mappings(struct chamelium *chamelium,lib/igt_chamelium.c +0
-1- int drm_fd, GKeyFile
*key_file)lib/igt_chamelium.c +1
-0+ int drm_fd){
drmModeRes *res;
drmModeConnector *connector;lib/igt_chamelium.c +0
-0@@ -1045,7 +1043,7 @@ static bool chamelium_read_port_mappings(structchamelium *chamelium, int port_i, i, j; bool ret = true;lib/igt_chamelium.c +1
-1- group_list =g_key_file_get_groups (key_file,NULL ); + group_list =g_key_file_get_groups (igt_key_file,NULL );
/* Count how many connector mappings are specified in the config */
for (i = 0; group_list[i] != NULL; i++) {lib/igt_chamelium.c +0
-0@@ -1068,7 +1066,7 @@ static bool chamelium_read_port_mappings(struct chamelium *chamelium,
port = &chamelium->ports[port_i++];port->name=strdup(map_name);lib/igt_chamelium.c +1
-1- port->id = g_key_file_get_integer(key_file, group, + port->id = g_key_file_get_integer(igt_key_file,group,
"ChameliumPortID", &error); if (!port->id) {lib/igt_chamelium.c +0
-0@@ -1125,47 +1123,22 @@ out:
static boolchamelium_read_config(struct chamelium *chamelium, int drm_fd)
{lib/igt_chamelium.c +0
-1-GKeyFile *key_file =g_key_file_new ();GError *error = NULL;
lib/igt_chamelium.c +0
-3-char *key_file_loc, *key_file_env; -int rc; -bool ret = true;lib/igt_chamelium.c +0
-6- key_file_env =getenv ("IGT_CONFIG_PATH" ); -if (key_file_env) { - key_file_loc = key_file_env; - }else { - key_file_loc =malloc (100 ); - snprintf(key_file_loc, 100, "%s/.igtrc",
g_get_home_dir());lib/igt_chamelium.c +2
-0+if (!igt_key_file) { + igt_warn("No configuration file available forchamelium\n");
lib/igt_chamelium.c +1
-0+return false;}
lib/igt_chamelium.c +0
-4- rc =g_key_file_load_from_file (key_file, key_file_loc, - G_KEY_FILE_NONE, &error); -if (!rc) { - igt_warn("Failed to read chamelium configurationfile: %s\n",
lib/igt_chamelium.c +0
-6- error->message); - ret = false; - goto out; - } - - chamelium->url = g_key_file_get_string(key_file,"Chamelium", "URL",
lib/igt_chamelium.c +1
-0+ chamelium->url = g_key_file_get_string(igt_key_file,"Chamelium", "URL",
&error); if (!chamelium->url) {
igt_warn("Couldn't read chamelium URL from config
file: %s\n",
error->message);lib/igt_chamelium.c +1
-2- ret = false; - goto out; +return false;}
lib/igt_chamelium.c +0
-1- ret = chamelium_read_port_mappings(chamelium, drm_fd,
key_file);lib/igt_chamelium.c +1
-8- -out: -g_key_file_free (key_file); - -if (!key_file_env) -free (key_file_loc); - -return ret; +return chamelium_read_port_mappings (chamelium, drm_fd);}
/**lib/igt_core.c +1
-0@@ -57,6 +57,7 @@ #include <limits.h> #include <locale.h> #include <uwildmat/uwildmat.h> +#include <glib.h>
#include "drmtest.h"
#include "intel_chipset.h"lib/igt_core.c +0
-0@@ -225,6 +226,23 @@ * - 'basic*,advanced*' match any subtest starting basic or advanced * - '*,!basic*' match any subtest not starting basic * - 'basic*,!basic-render*' match any subtest starting basic butnot starting basic-render
+ *
+ * # Configuration
+ *
+ * Some of IGT's behavior can be configured through a configuration file.
+ * By default, this file is expected to exist in ~/.igtrc . The directory for
+ * this can be overriden by setting the environment variable %IGT_CONFIG_PATH.
+ * An example configuration follows:
+ *
+ * |[<!-- language="plain" -->
+ * # The following section is used for configuring the Device
Under Test.
+ * # It is not mandatory and allows overriding default
values.
+ * [DUT]
+ * SuspendResumeDelay=10
+ * ]|
+ *
+ * Some specific configuration options may be used by specific parts of IGT,
+ * such as those related to Chamelium support.
*/
static unsigned intexit_handler_count;lib/igt_core.c +0
-0@@ -271,6 +289,8 @@ static struct { } log_buffer; static pthread_mutex_t log_buffer_mutex = PTHREAD_MUTEX_INITIALIZER;lib/igt_core.c +2
-0+GKeyFile *igt_key_file; +const char
*igt_test_name(void)
{
returncommand_str;lib/igt_core.c +0
-0@@ -593,6 +613,20 @@ static void oom_adjust_for_doom(void)
}
lib/igt_core.c static void oom_adjust_for_doom(void) · line 625
Quoted 10 lines
lib/igt_core.c +10
-0+static void config_parse (void ) +{ +GError *error =NULL ; +int rc; + +if (!igt_key_file) +return ; + + rc =g_key_file_get_integer (igt_key_file,"DUT" ,"SuspendResumeDelay" , + &error);
We should probably at least throw an error if the key value happens to be there, but the value is invalid (such as someone specifying "foo" as the SuspendResumeDelay value). Maybe add a function like
static intigt_config_get_integer(const char *section, const char *key_name, int *value, int default)
That calls the appropriate glib functions, and fails the current test if any invalid non-default values are given
Quoted 157 lines
lib/igt_core.c +4
-0+if (rc !=0 ) +igt_set_autoresume_delay (rc); +} +static int common_init(int *argc, char **argv, const char
*extra_short_opts, const struct option*extra_long_opts,lib/igt_core.c +3
-0@@ -616,6 +650,9 @@ static int common_init(int *argc, char **argv, int extra_opt_count; int all_opt_count; int ret = 0; +char *key_file_loc =NULL ; +char *key_file_env =NULL ; +GError *error =NULL ; const char *env;
if (!isatty(STDOUT_FILENO) ||getenv("IGT_PLAIN_OUTPUT"))lib/igt_core.c +0
-0@@ -737,7 +774,31 @@ static int common_init(int *argc, char **argv, } }lib/igt_core.c +6
-0+ key_file_env =getenv ("IGT_CONFIG_PATH" ); +if (key_file_env) { + key_file_loc = key_file_env; + }else { + key_file_loc =malloc (100 ); + snprintf(key_file_loc, 100, "%s/.igtrc",
g_get_home_dir());lib/igt_core.c +15
-0+ } + + igt_key_file =g_key_file_new (); + ret =g_key_file_load_from_file (igt_key_file, key_file_loc, +G_KEY_FILE_NONE , &error); +if (!ret) { +g_key_file_free (igt_key_file); + igt_key_file =NULL ; + ret =-1 ; + + goto out; + } + +config_parse (); +out:
lib/igt_core.c +3
-0+if (!key_file_env && key_file_loc) +free (key_file_loc); +
free(short_opts);
free(combined_opts);lib/igt_core.c +0
-0@@ -1345,6 +1406,9 @@ void igt_exit(void) { igt_exit_called = true;lib/igt_core.c +3
-0+if (igt_key_file) +g_key_file_free (igt_key_file); +if (
run_single_subtest&& !run_single_subtest_found) {igt_warn("Unknown subtest: %s\n", run_single_subtest);
exit(IGT_EXIT_INVALID);lib/igt_core.h +1
-0@@ -40,6 +40,7 @@ #include <stdarg.h> #include <getopt.h> #include <unistd.h> +#include <glib.h>
#ifndefIGT_LOG_DOMAIN
#defineIGT_LOG_DOMAIN(NULL)lib/igt_core.h +0
-0@@ -48,6 +49,7 @@
extern const char*__igt_test_description__attribute__((weak)); extern bool__igt_plain_output;
+extern GKeyFile*igt_key_file;
/**tests/Makefile.am +0
-0@@ -72,9 +72,9 @@ AM_CFLAGS = $(DRM_CFLAGS) $(CWARNFLAGS) -Wno- unused-result $(DEBUG_CFLAGS)\ $(LIBUNWIND_CFLAGS) $(WERROR_CFLAGS) \ $(NULL)tests/Makefile.am +1
-1-LDADD = ../lib/libintel_tools.la $(GLIB_LIBS) $(XMLRPC_LIBS) +LDADD = ../lib/libintel_tools.la $(XMLRPC_LIBS)tests/Makefile.am +1
-1-AM_CFLAGS += $(CAIRO_CFLAGS) $(LIBUDEV_CFLAGS) $(GLIB_CFLAGS) +AM_CFLAGS += $(CAIRO_CFLAGS) $(LIBUDEV_CFLAGS)AM_LDFLAGS = -Wl,--as-needed
drm_import_export_CFLAGS = $(AM_CFLAGS) $(THREAD_CFLAGS)tests/chamelium.c +0
-0@@ -42,7 +42,6 @@ typedef struct { } data_t;
#defineHOTPLUG_TIMEOUT20 /* seconds */ -#defineSUSPEND_RESUME_DELAY20 /* seconds */
#defineHPD_STORM_PULSE_INTERVAL_DP100 /* ms */ #defineHPD_STORM_PULSE_INTERVAL_HDMI200 /* ms */tests/chamelium.c +0
-0@@ -225,21 +224,21 @@ try_suspend_resume_hpd(data_t *data, struct chamelium_port *port,enum
igt_suspend_statestate, enumigt_suspend_testtest,
structudev_monitor*mon, bool connected) {tests/chamelium.c +1
-0+int delay;int p;
tests/chamelium.c +0
-1-igt_set_autoresume_delay (SUSPEND_RESUME_DELAY );
igt_flush_hotplugs(mon);tests/chamelium.c +2
-0+ delay =igt_get_autoresume_delay (state) *1000 /2 ; +if (port) {
tests/chamelium.c +0
-2- chamelium_schedule_hpd_toggle(data->chamelium, port, - SUSPEND_RESUME_DELAY *1000 / 2,
tests/chamelium.c +1
-0+ chamelium_schedule_hpd_toggle(data->chamelium, port,delay,
!connected); } else {
for (p = 0; p <data->port_count; p++) { port = data->ports[p]; chamelium_schedule_hpd_toggle(data-Quoted 1 line
chamelium, port,
tests/chamelium.c +0
-1- SUSPEND_RESUME
_DELAY* 1000 / 2,tests/chamelium.c +1
-1- !connected); + delay,!connected);
}
port = NULL;tools/Makefile.am +0
-0@@ -9,8 +9,8 @@ endif
ifHAVE_UDEV
bin_PROGRAMS +=intel_dp_compliancetools/Makefile.am +0
-2-intel_dp_compliance_CFLAGS = $(AM_CFLAGS) $(GLIB_CFLAGS) -intel_dp_compliance_LDADD = $(top_builddir)/lib/libintel_tools.la$(GLIB_LIBS)
tools/Makefile.am +2
-0+intel_dp_compliance_CFLAGS = $(AM_CFLAGS) +intel_dp_compliance_LDADD = $(top_builddir)/lib/libintel_tools.la
Quoted 3 lines
endif
SUBDIRS =null_state_genregisters
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Lyude Paul
NAKRe: [PATCH i-g-t v2 6/7] tests/chamelium: Disconnect connectors without extra reset
In reply to Paul KocialkowskiNAK, I'd rather just go with the idea you had with removing the connector reset in chamelium_init()
Quoted 119 lines · Paul Kocialkowski
This removes the reset call from the
reset_statefunction and renames it
todisconnect_connector. Since a call to reset is already done inchamelium_init, there is no need to do an extra reset in each test.This allows reducing the execution time a bit.
Signed-off-by Paul Kocialkowski <[email protected]>---
tests/chamelium.c | 22 +++++++++++-----------1 file changed, 11 insertions(+), 11 deletions(-)tests/chamelium.c +0
-0@@ -145,17 +145,17 @@ wait_for_connector(data_t *data, struct chamelium_port *port, }
static voidtests/chamelium.c +1
-1-reset_state(data_t *data, struct chamelium_port *port) +disconnect_connector(data_t *data, struct chamelium_port *port){
int p;tests/chamelium.c +0
-2-chamelium_reset (data->chamelium); -if (port) {
tests/chamelium.c +1
-0+chamelium_unplug (data->chamelium, port);
wait_for_connector(data, port, DRM_MODE_DISCONNECTED, false);
} else {
for (p = 0; p <data->port_count; p++) { port = data->ports[p];tests/chamelium.c +1
-0+chamelium_unplug (data->chamelium, port);wait_for_connector(data, port,
DRM_MODE_DISCONNECTED,
false); }tests/chamelium.c +0
-0@@ -168,7 +168,7 @@ test_basic_hotplug(data_t *data, struct chamelium_port *port, int toggle_count) struct udev_monitor *mon = igt_watch_hotplug(); int i;tests/chamelium.c +1
-1-reset_state (data,NULL ); +disconnect_connector (data,NULL );
igt_hpd_storm_set_threshold(data->drm_fd, 0);
for (i = 0; i <toggle_count; i++) {tests/chamelium.c +0
-0@@ -202,7 +202,7 @@ test_edid_read(data_t *data, structchamelium_port *port, data->chamelium, port, false); uint64_t edid_blob_id;tests/chamelium.c +1
-1-reset_state (data, port); +disconnect_connector (data, port);
chamelium_port_set_edid(data->chamelium, port, edid_id);chamelium_plug(data->chamelium, port);tests/chamelium.c +0
-0@@ -270,7 +270,7 @@ test_suspend_resume_hpd(data_t *data, struct chamelium_port *port, { struct udev_monitor *mon = igt_watch_hotplug();tests/chamelium.c +1
-1-reset_state (data, port); +disconnect_connector (data, port);
/* Make sure we notice new connectors after resuming */try_suspend_resume_hpd(data, port, state, test, mon, false);tests/chamelium.c +0
-0@@ -294,7 +294,7 @@ test_suspend_resume_hpd_common(data_t *data, enum igt_suspend_state state, igt_debug("Testing port %s\n", chamelium_port_get_name(port)); }tests/chamelium.c +1
-1-reset_state (data,NULL ); +disconnect_connector (data,NULL );
/* Make sure we notice new connectors after resuming */try_suspend_resume_hpd(data, NULL, state, test, mon, false);tests/chamelium.c +0
-0@@ -314,7 +314,7 @@ test_suspend_resume_edid_change(data_t *data, struct chamelium_port *port, { struct udev_monitor *mon = igt_watch_hotplug();tests/chamelium.c +1
-1-reset_state (data, port); +disconnect_connector (data, port);
/* First plug in the port */chamelium_port_set_edid(data->chamelium, port, edid_id);tests/chamelium.c +0
-0@@ -582,7 +582,7 @@ test_hpd_without_ddc(data_t *data, struct chamelium_port *port) { struct udev_monitor *mon = igt_watch_hotplug();tests/chamelium.c +1
-1-reset_state (data, port); +disconnect_connector (data, port);
igt_flush_hotplugs(mon);
/* Disable the DDC on the connector and make sure we still get atests/chamelium.c +0
-0@@ -604,7 +604,7 @@ test_hpd_storm_detect(data_t *data, struct chamelium_port *port, int width) int count = 0;
igt_require_hpd_storm_ctl(data->drm_fd);tests/chamelium.c +1
-1-reset_state (data, port); +disconnect_connector (data, port);
igt_hpd_storm_set_threshold(data->drm_fd, 1);chamelium_fire_hpd_pulses(data->chamelium, port, width, 10);tests/chamelium.c +1
-1@@ -629,7 +629,7 @@ static void test_hpd_storm_disable(data_t *data, struct chamelium_port *port, int width) { igt_require_hpd_storm_ctl(data->drm_fd); -reset_state (data, port); +disconnect_connector (data, port);
Quoted 3 lines
igt_hpd_storm_set_threshold(data->drm_fd, 0); chamelium_fire_hpd_pulses(data->chamelium, port,
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
FYI: I reviewed and pushed patches 1-4 of this series, thanks!
Quoted 48 lines · Paul Kocialkowski
This stores the autoresume delay provided via
igt_set_autoresume_delay
for use during suspend via rtc wake scheduling. This delay was previously only used forpm_testsuspendm while the function suggests it should be applied to all autoresume cases.There is also definitely a use case for configuring the rtc wake delay,
so this implements it.Signed-off-by Paul Kocialkowski <[email protected]>---
lib/igt_aux.c | 9 ++++++++-1 file changed, 8 insertions(+), 1 deletion(-)lib/igt_aux.c +0
-0@@ -680,6 +680,8 @@ void igt_cleanup_aperture_trashers(void) free(trash_bos); }lib/igt_aux.c +2
-0+static int autoresume_delay; +static const char *suspend_state_name[] = {
[SUSPEND_STATE_FREEZE] = "freeze",
[SUSPEND_STATE_STANDBY] = "standby",lib/igt_aux.c +0
-0@@ -746,7 +748,10 @@ static void suspend_via_rtcwake(enum igt_suspend_state state)
igt_assert(state < SUSPEND_STATE_NUM);lib/igt_aux.c +4
-1- delay = state ==SUSPEND_STATE_DISK ?30 :15 ; +if (autoresume_delay) + delay = autoresume_delay; +else + delay = state ==SUSPEND_STATE_DISK ?30 :15 ;
/*
* Skip if rtcwake would fail for a reason not related to the kernel'slib/igt_aux.c +0
-0@@ -889,6 +894,8 @@ void igt_set_autoresume_delay(int delay_secs) igt_require(write(delay_fd, delay_str, strlen(delay_str)));
close(delay_fd);lib/igt_aux.c +2
-0+ + autoresume_delay = delay_secs;
Quoted 3 lines
}
/**
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH i-g-t v2 5/7] tests/chamelium: Update connector state without reprobe when possible
In reply to Paul KocialkowskiI -think- this one might be okay but I just got reminded of a rather not-obvious part of the DRM spec for hotplugging, and I need to check that this doesn't actually break that. will get back to you in a bit with an actual review :)
Quoted 170 lines · Paul Kocialkowski
This renames the
reprobe_connectorfunction toupdate_connectorand ensures that full reprobe of the connector is only done when really necessary (e.g. when changing the EDID).A full reprobe takes time and is not required for updating the connector
state. Thus, this allows executing tests faster.Signed-off-by Paul Kocialkowski <[email protected]>---
tests/chamelium.c | 34 ++++++++++++++++++----------------1 file changed, 18 insertions(+), 16 deletions(-)tests/chamelium.c +0
-0@@ -103,13 +103,14 @@ require_connector_present(data_t *data, unsigned int type) }
static drmModeConnectiontests/chamelium.c +1
-1-reprobe_connector(data_t *data, struct chamelium_port *port) +update_connector(data_t *data, struct chamelium_port *port, boolreprobe)
{
drmModeConnector *connector;
drmModeConnection status;tests/chamelium.c +0
-1- igt_debug("Reprobing %s...\n",
chamelium_port_get_name(port));tests/chamelium.c +0
-1- connector = chamelium_port_get_connector(data->chamelium,port, true);
tests/chamelium.c +1
-0+ igt_debug("Updating %s...\n",
chamelium_port_get_name(port));tests/chamelium.c +1
-0+ connector = chamelium_port_get_connector(data->chamelium,port,
tests/chamelium.c +1
-0+ reprobe);
igt_assert(connector);
status =connector->connection;tests/chamelium.c +0
-0@@ -119,7 +120,7 @@ reprobe_connector(data_t *data, struct chamelium_port *port)
static void
wait_for_connector(data_t *data, structchamelium_port*port,tests/chamelium.c +1
-1- drmModeConnection status) + drmModeConnection status, bool reprobe){
bool finished = false;tests/chamelium.c +0
-0@@ -132,7 +133,7 @@ wait_for_connector(data_t *data, structchamelium_port *port, * that hpd events work in the event that hpd doesn't workon the system
*/
igt_until_timeout(HOTPLUG_TIMEOUT){tests/chamelium.c +1
-1-if (reprobe_connector (data, port) == status) { +if (update_connector (data, port, reprobe) == status){
finished = true;
return;
}tests/chamelium.c +0
-0@@ -151,11 +152,12 @@ reset_state(data_t *data, struct chamelium_port *port) chamelium_reset(data->chamelium);
if (port) {tests/chamelium.c +0
-1- wait_for_connector(data, port,
DRM_MODE_DISCONNECTED);tests/chamelium.c +1
-0+ wait_for_connector(data, port,
DRM_MODE_DISCONNECTED, false);
} else {
for (p = 0; p <data->port_count; p++) { port = data->ports[p];tests/chamelium.c +0
-1- wait_for_connector(data, port,
DRM_MODE_DISCONNECTED);tests/chamelium.c +1
-0+ wait_for_connector(data, port,
DRM_MODE_DISCONNECTED,tests/chamelium.c +1
-0+ false);}
}
}tests/chamelium.c +1
-1@@ -175,7 +177,7 @@ test_basic_hotplug(data_t *data, struct chamelium_port *port, int toggle_count) /* Check if we get a sysfs hotplug event */ chamelium_plug(data->chamelium, port); igt_assert(igt_hotplug_detected(mon,HOTPLUG_TIMEOUT )); -igt_assert_eq (reprobe_connector (data, port), +igt_assert_eq (update_connector (data, port, false), DRM_MODE_CONNECTED);
igt_flush_hotplugs(mon);tests/chamelium.c +1
-1@@ -183,7 +185,7 @@ test_basic_hotplug(data_t *data, struct chamelium_port *port, int toggle_count) /* Now check if we get a hotplug from disconnection */ chamelium_unplug(data->chamelium, port); igt_assert(igt_hotplug_detected(mon,HOTPLUG_TIMEOUT )); - igt_assert_eq(reprobe_connector(data, port), + igt_assert_eq(update_connector(data, port, false),DRM_MODE_DISCONNECTED); }
tests/chamelium.c +0
-0@@ -204,7 +206,7 @@ test_edid_read(data_t *data, struct chamelium_port *port,
chamelium_port_set_edid(data->chamelium, port, edid_id);chamelium_plug(data->chamelium, port);tests/chamelium.c +1
-1-wait_for_connector (data, port,DRM_MODE_CONNECTED ); +wait_for_connector (data, port,DRM_MODE_CONNECTED , true);
igt_assert(kmstest_get_property(data->drm_fd, connector-Quoted 1 line
connector_id,
DRM_MODE_OBJECT_CONNECTOR, "EDID", NULL,tests/chamelium.c +0
-0@@ -247,13 +249,13 @@ try_suspend_resume_hpd(data_t *data, struct chamelium_port *port,
igt_assert(igt_hotplug_detected(mon, HOTPLUG_TIMEOUT)); if (port) {tests/chamelium.c +0
-1- igt_assert_eq(reprobe_connector(data, port),connected ?
tests/chamelium.c +1
-0+ igt_assert_eq(update_connector(data, port, false),connected ?
DRM_MODE_DISCONNECTED :DRM_MODE_CONNECTED);
} else {
for (p = 0; p <data->port_count; p++) { port = data->ports[p];tests/chamelium.c +0
-1- igt_assert_eq(reprobe_connector(data, port),connected ?
tests/chamelium.c +1
-1- DRM_MODE_DISCONNECTED : + igt_assert_eq(update_connector(data, port,false),
tests/chamelium.c +1
-0+ connected ?
DRM_MODE_DISCONNECTED:
DRM_MODE_CONNECTED); }tests/chamelium.c +1
-1@@ -317,7 +319,7 @@ test_suspend_resume_edid_change(data_t *data,struct chamelium_port *port, /* First plug in the port */ chamelium_port_set_edid(data->chamelium, port, edid_id); chamelium_plug(data->chamelium, port); -wait_for_connector (data, port,DRM_MODE_CONNECTED ); +wait_for_connector (data, port,DRM_MODE_CONNECTED , true);
igt_flush_hotplugs(mon);tests/chamelium.c +0
-0@@ -352,7 +354,7 @@ prepare_output(data_t *data,chamelium_port_set_edid(data->chamelium, port, data-
Quoted 1 line
edid_id);
chamelium_plug(data->chamelium, port);tests/chamelium.c +1
-1-wait_for_connector (data, port,DRM_MODE_CONNECTED ); +wait_for_connector (data, port,DRM_MODE_CONNECTED , true);
igt_display_init(display, data->drm_fd); output =igt_output_from_connector(display, connector);tests/chamelium.c +0
-0@@ -590,7 +592,7 @@ test_hpd_without_ddc(data_t *data, struct chamelium_port *port) chamelium_plug(data->chamelium, port);
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 +1
-0+ igt_assert_eq(update_connector(data, port, false),
Quoted 4 lines
DRM_MODE_CONNECTED);
igt_cleanup_hotplug(mon);
}
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH i-g-t v2 7/7] Make igtrc configuration common, with configurable suspend/resume delay
In reply to Lyude PaulQuoted 301 lines · Lyude Paul
Quoted 283 lines · Paul Kocialkowski
This adds support for configurable suspend/resume delay and takes the occasion to move igtrc configuation from
igt_chameliumtoigt_core. This way, suspend/resume delay configuration can be used for all tests.Signed-off-by Paul Kocialkowski <[email protected]>--- lib/Makefile.am | 2 ++ lib/igt_aux.c | 27 ++++++++++++++++++---- lib/igt_aux.h | 1 + lib/igt_chamelium.c | 49 +++++++++------------------------------- lib/igt_core.c | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++++ lib/igt_core.h | 2 ++ tests/Makefile.am | 4 ++-- tests/chamelium.c | 11 +++++---- tools/Makefile.am | 4 ++-- 9 files changed, 112 insertions(+), 52 deletions(-)lib/Makefile.am +2
-0@@ -41,6 +41,7 @@ AM_CFLAGS = \ $(XMLRPC_CFLAGS) \ $(LIBUDEV_CFLAGS) \ $(PIXMAN_CFLAGS) \ + $(GLIB_CFLAGS) \ $(VALGRIND_CFLAGS) \ -DIGT_SRCDIR=\""$(abs_top_srcdir)/tests"\" \ -DIGT_DATADIR=\""$(pkgdatadir)"\" \@@ -61,5 +62,6 @@ libintel_tools_la_LIBADD = \ $(XMLRPC_LIBS) \ $(LIBUDEV_LIBS) \ $(PIXMAN_LIBS) \ + $(GLIB_LIBS) \ -lmlib/igt_aux.c +1
-4@@ -748,10 +748,7 @@ static void suspend_via_rtcwake(enum igt_suspend_state state) igt_assert(state < SUSPEND_STATE_NUM); -if (autoresume_delay) - delay = autoresume_delay; -else - delay = state ==SUSPEND_STATE_DISK ?30 :15 ; + delay =igt_get_autoresume_delay (state);/* * Skip if rtcwake would fail for a reason not related to
the kernel'slib/igt_aux.c +4
-0@@ -899,6 +896,28 @@ void igt_set_autoresume_delay(int delay_secs) }/** +* igt_get_autoresume_delay: +* @state: an #igt_suspend_state, the target suspend state +* +* Retrieves how long we wait to resume the system after suspending it.
+ * This can either be set throughigt_set_autoresume_delayor be a default
+ * value that depends on the suspend state.
+ *
+ * Returns: The autoresume delay, in seconds.
+ */lib/igt_aux.c +13
-0+int igt_get_autoresume_delay (enum igt_suspend_state state) +{ +int delay; + +if (autoresume_delay) + delay = autoresume_delay; +else + delay = state ==SUSPEND_STATE_DISK ?30 :15 ; + +return delay; +} + +/** * igt_drop_root: * * Drop root privileges and make sure it actually worked. Useful for tests
lib/igt_aux.h +1
-0@@ -192,6 +192,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); +int igt_get_autoresume_delay (enum igt_suspend_state state);/* dropping priviledges */ void igt_drop_root (void );lib/igt_chamelium.c +0
-0@@ -51,8 +51,8 @@* [on the ChromeOS project page](https://www.chromium.org/chromium- os/testing/chamelium).
*
* In order to run tests using the Chamelium, a valid configuration
file must be
- * present. The configuration file is a normal Glib keyfile (similar to Windows
- * INI) structured like so:
+ * present. It must contain Chamelium-specific keys as shown with the following
+ * example:
*
* |[<!-- language="plain" -->
* [Chamelium]lib/igt_chamelium.c +0
-1@@ -72,8 +72,6 @@* ChameliumPortID=3 * ]| * -* By default, this file is expected to exist in ~/.igtrc . The directory for
- * this can be overriden by setting the environment variable %IGT_CONFIG_PATH.
*/struct
chamelium_edid{lib/igt_chamelium.c +1
-1@@ -1034,7 +1032,7 @@ static unsigned int chamelium_get_port_type(struct chamelium *chamelium, } static bool chamelium_read_port_mappings(struct chamelium *chamelium, -int drm_fd,GKeyFile *key_file) + int drm_fd){
lib/igt_chamelium.c +1
-1drmModeRes *res;drmModeConnector *connector;@@ -1045,7 +1043,7 @@ static bool chamelium_read_port_mappings(structchamelium *chamelium, int port_i, i, j;bool ret = true; - group_list =g_key_file_get_groups (key_file,NULL ); + group_list =g_key_file_get_groups (igt_key_file,NULL );/* Count how many connector mappings are specified in the config */
lib/igt_chamelium.c +1
-1for (i =0 ; group_list[i] !=NULL ; i++) {@@ -1068,7 +1066,7 @@ static bool chamelium_read_port_mappings(structchamelium *chamelium, port = &chamelium->ports[port_i++]; port->name =strdup (map_name); - port->id = g_key_file_get_integer(key_file, group, + port->id = g_key_file_get_integer(igt_key_file, group, "ChameliumPortID",lib/igt_chamelium.c +5
-23&error);if (!port->id) {@@ -1125,47 +1123,22 @@ out:static bool chamelium_read_config (struct chamelium *chamelium,int drm_fd) { -GKeyFile *key_file =g_key_file_new ();GError *error =NULL ; -char *key_file_loc, *key_file_env; -int rc; -bool ret = true; - key_file_env =getenv ("IGT_CONFIG_PATH" ); -if (key_file_env) { - key_file_loc = key_file_env; - }else { - key_file_loc =malloc (100 ); -snprintf (key_file_loc,100 ,"%s/.igtrc" , g_get_home_dir()); +if (!igt_key_file) { +igt_warn ("No configuration file available for chamelium\n"); +return false; } - rc =g_key_file_load_from_file (key_file, key_file_loc, -G_KEY_FILE_NONE , &error); -if (!rc) { -igt_warn ("Failed to read chamelium configuration file: %s\n", - error->message); - ret = false; - goto out; - } - - chamelium->url =g_key_file_get_string (key_file, "Chamelium", "URL", + chamelium->url =g_key_file_get_string (igt_key_file,"Chamelium" ,"URL" , &error);if (!chamelium->url) {igt_warn ("Couldn't read chamelium URL from config file: %s\n", error->message); - ret = false; - goto out; +return false; } - ret = chamelium_read_port_mappings(chamelium, drm_fd,
key_file);lib/igt_chamelium.c +1
-8- -out: -g_key_file_free (key_file); - -if (!key_file_env) -free (key_file_loc); - -return ret; +return chamelium_read_port_mappings (chamelium, drm_fd); }/** lib/igt_core.c +1
-0@@ -57,6 +57,7 @@#include <limits.h> #include <locale.h> #include <uwildmat/uwildmat.h> +#include <glib.h> #include "drmtest.h" #include "intel_chipset.h" @@ -225,6 +226,23 @@* - 'basic*,advanced*' match any subtest starting basic or advanced * - '*,!basic*' match any subtest not starting basic * - 'basic*,!basic-render*' match any subtest starting basic but not starting basic-render
+ *
+ * # Configuration
+ *
+ * Some of IGT's behavior can be configured through a configuration file.
+ * By default, this file is expected to exist in ~/.igtrc . The directory for
+ * this can be overriden by setting the environment variable %IGT_CONFIG_PATH.
+ * An example configuration follows:
+ *
+ * |[<!-- language="plain" -->
+ * # The following section is used for configuring the Device
Under Test.
+ * # It is not mandatory and allows overriding default
values.
+ * [DUT]
+ * SuspendResumeDelay=10
+ * ]|
+ *
+ * Some specific configuration options may be used by specific parts of IGT,
+ * such as those related to Chamelium support.
*/static unsigned int
exit_handler_count;lib/igt_core.c +3
-0@@ -271,6 +289,8 @@ static struct { } log_buffer;static pthread_mutex_t log_buffer_mutex =PTHREAD_MUTEX_INITIALIZER ; +GKeyFile *igt_key_file; +const char *igt_test_name (void ) {return command_str;@@ -593,6 +613,20 @@ static void oom_adjust_for_doom(void) } +static void config_parse (void )lib/igt_core.c static void oom_adjust_for_doom(void) · line 626
Quoted 10 lines
lib/igt_core.c +9
-0+{ +GError *error =NULL ; +int rc; + +if (!igt_key_file) +return ; + + rc =g_key_file_get_integer (igt_key_file,"DUT" ,"SuspendResumeDelay" , + &error);We should probably at least throw an error if the key value happens to be there, but the value is invalid (such as someone specifying "foo" as the SuspendResumeDelay value). Maybe add a function like
Quoted 6 lines
static int
igt_config_get_integer(const char *section, const char *key_name, int *value, int default)That calls the appropriate glib functions, and fails the current test if any invalid non-default values are given
Fair enough, but how about simply testing error == G_KEY_FILE_ERROR_INVALID_VALUE (meaning the value was defined but could not be correctly interpreted) inline? It seems a bit overkill to add a specific helper function for that.
Quoted 161 lines
Quoted 161 lines
lib/igt_core.c +4
-0+if (rc !=0 ) +igt_set_autoresume_delay (rc); +} + static int common_init(int *argc, char **argv, const char *extra_short_opts,lib/igt_core.c +30
-0const struct option *extra_long_opts,@@ -616,6 +650,9 @@ static int common_init(int *argc, char **argv,int extra_opt_count;int all_opt_count;int ret =0 ; +char *key_file_loc =NULL ; +char *key_file_env =NULL ; +GError *error =NULL ;const char *env;if (!isatty (STDOUT_FILENO ) ||getenv ("IGT_PLAIN_OUTPUT" ))@@ -737,7 +774,31 @@ static int common_init(int *argc, char **argv, } } + key_file_env =getenv ("IGT_CONFIG_PATH" ); +if (key_file_env) { + key_file_loc = key_file_env; + }else { + key_file_loc =malloc (100 ); +snprintf (key_file_loc,100 ,"%s/.igtrc" ,g_get_home_dir ()); + } + + igt_key_file =g_key_file_new (); + ret =g_key_file_load_from_file (igt_key_file, key_file_loc, +G_KEY_FILE_NONE , &error); +if (!ret) { +g_key_file_free (igt_key_file); + igt_key_file =NULL ; + ret =-1 ; + + goto out; + } + +config_parse (); + out: +if (!key_file_env && key_file_loc) +free (key_file_loc); +free (short_opts);free (combined_opts);@@ -1345,6 +1406,9 @@ void igt_exit(void) { igt_exit_called = true; +if (igt_key_file) +g_key_file_free (igt_key_file); +if (run_single_subtest && !run_single_subtest_found) {igt_warn ("Unknown subtest: %s\n" , run_single_subtest);lib/igt_core.c +0
-0exit (IGT_EXIT_INVALID );lib/igt_core.h +2
-0@@ -40,6 +40,7 @@#include <stdarg.h> #include <getopt.h> #include <unistd.h> +#include <glib.h> #ifndef IGT_LOG_DOMAIN #define IGT_LOG_DOMAIN (NULL)@@ -48,6 +49,7 @@ extern const char* __igt_test_description __attribute__((weak));extern bool __igt_plain_output; +extern GKeyFile *igt_key_file;/** tests/Makefile.am +2
-2@@ -72,9 +72,9 @@ AM_CFLAGS = $(DRM_CFLAGS) $(CWARNFLAGS) -Wno- unused-result $(DEBUG_CFLAGS)\ $(LIBUNWIND_CFLAGS) $(WERROR_CFLAGS) \ $(NULL) -LDADD = ../lib/libintel_tools.la $(GLIB_LIBS) $(XMLRPC_LIBS) +LDADD = ../lib/libintel_tools.la $(XMLRPC_LIBS) -AM_CFLAGS += $(CAIRO_CFLAGS) $(LIBUDEV_CFLAGS) $(GLIB_CFLAGS) +AM_CFLAGS += $(CAIRO_CFLAGS) $(LIBUDEV_CFLAGS) AM_LDFLAGS = -Wl,--as-needed
drm_import_export_CFLAGS= $(AM_CFLAGS) $(THREAD_CFLAGS)tests/chamelium.c +4
-4@@ -42,7 +42,6 @@ typedef struct { } data_t;#define HOTPLUG_TIMEOUT 20/* seconds */ -#define SUSPEND_RESUME_DELAY 20/* seconds */ #define HPD_STORM_PULSE_INTERVAL_DP 100/* ms */ #define HPD_STORM_PULSE_INTERVAL_HDMI 200/* ms */ @@ -225,21 +224,21 @@ try_suspend_resume_hpd(data_t *data, structchamelium_port *port, enum igt_suspend_state state, enum igt_suspend_test test, struct udev_monitor *mon, bool connected) { + int delay;int p; -igt_set_autoresume_delay (SUSPEND_RESUME_DELAY );igt_flush_hotplugs (mon); + delay =igt_get_autoresume_delay (state) *1000 /2 ; +if (port) { -chamelium_schedule_hpd_toggle (data->chamelium, port, -SUSPEND_RESUME_DELAY *1000 /2 , +chamelium_schedule_hpd_toggle (data->chamelium, port, delay, !connected); }else {for (p =0 ; p < data->port_count; p++) { port = data->ports[p]; chamelium_schedule_hpd_toggle(data-Quoted 1 line
chamelium, port,
tests/chamelium.c +0
-1-SUSPEND_RESUME
_DELAY* 1000 / 2,tests/chamelium.c +1
-1- !connected); + delay,!connected);
tests/chamelium.c +0
-0} port =NULL ;tools/Makefile.am +2
-2@@ -9,8 +9,8 @@ endif if HAVE_UDEV bin_PROGRAMS += intel_dp_compliance -intel_dp_compliance_CFLAGS = $(AM_CFLAGS) $(GLIB_CFLAGS) -intel_dp_compliance_LDADD = $(top_builddir)/lib/libintel_tools.la $(GLIB_LIBS) +intel_dp_compliance_CFLAGS = $(AM_CFLAGS) +intel_dp_compliance_LDADD = $(top_builddir)/lib/libintel_tools.la endifSUBDIRS =
null_state_genregisters
Signature · 6 lines
Paul Kocialkowski <[email protected]> Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH i-g-t v2 5/7] tests/chamelium: Update connector state without reprobe when possible
In reply to Lyude PaulQuoted 4 lines · Lyude Paul
I -think- this one might be okay but I just got reminded of a rather not-obvious part of the DRM spec for hotplugging, and I need to check that this doesn't actually break that. will get back to you in a bit with an actual review :)
Martin was really expecting this to come around, so I hope it is in accordance with the DRM spec. At least, it works properly with i915 on SKL.
Thanks for double-checking!
Quoted 177 lines · Paul Kocialkowski
Quoted 176 lines
This renames the
reprobe_connectorfunction toupdate_connectorand ensures that full reprobe of the connector is only done when really necessary (e.g. when changing the EDID).A full reprobe takes time and is not required for updating the connector
state. Thus, this allows executing tests faster.Signed-off-by Paul Kocialkowski <[email protected]>--- tests/chamelium.c | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-)tests/chamelium.c +1
-3@@ -103,13 +103,14 @@ require_connector_present(data_t *data, unsigned int type) }static drmModeConnection -reprobe_connector (data_t *data,struct chamelium_port *port) +update_connector (data_t *data,struct chamelium_port *port,bool reprobe) {drmModeConnector *connector;drmModeConnection status; -igt_debug ("Reprobing %s...\n" , chamelium_port_get_name(port)); - connector = chamelium_port_get_connector(data->chamelium,port, true);
tests/chamelium.c +1
-0+ igt_debug("Updating %s...\n",
chamelium_port_get_name(port));tests/chamelium.c +1
-0+ connector = chamelium_port_get_connector(data->chamelium,port,
tests/chamelium.c +2
-1+ reprobe);igt_assert (connector); status = connector->connection;@@ -119,7 +120,7 @@ reprobe_connector(data_t *data, struct chamelium_port *port)static void wait_for_connector (data_t *data,struct chamelium_port *port, -drmModeConnection status) +drmModeConnection status,bool reprobe) {bool finished = false;@@ -132,7 +133,7 @@ wait_for_connector(data_t *data, structchamelium_port *port, * that hpd events work in the event that hpd doesn't workon the system
tests/chamelium.c +1
-1*/ igt_until_timeout (HOTPLUG_TIMEOUT ) { -if (reprobe_connector (data, port) == status) { +if (update_connector (data, port, reprobe) == status){
tests/chamelium.c +1
-2finished = true;return ; }@@ -151,11 +152,12 @@ reset_state(data_t *data, struct chamelium_port *port)chamelium_reset (data->chamelium);if (port) { -wait_for_connector (data, port, DRM_MODE_DISCONNECTED); +wait_for_connector (data, port,DRM_MODE_DISCONNECTED , false); }else {for (p =0 ; p < data->port_count; p++) { port = data->ports[p]; - wait_for_connector(data, port,
DRM_MODE_DISCONNECTED);tests/chamelium.c +1
-0+ wait_for_connector(data, port,
DRM_MODE_DISCONNECTED,tests/chamelium.c +2
-1+ false); } } }@@ -175,7 +177,7 @@ test_basic_hotplug(data_t *data, struct chamelium_port *port, int toggle_count)/* Check if we get a sysfs hotplug event */ chamelium_plug(data->chamelium, port);igt_assert (igt_hotplug_detected (mon,HOTPLUG_TIMEOUT )); -igt_assert_eq (reprobe_connector (data, port), +igt_assert_eq (update_connector (data, port, false),DRM_MODE_CONNECTED );tests/chamelium.c +1
-1igt_flush_hotplugs (mon);@@ -183,7 +185,7 @@ test_basic_hotplug(data_t *data, struct chamelium_port *port, int toggle_count)/* Now check if we get a hotplug from disconnection */ chamelium_unplug(data->chamelium, port);igt_assert (igt_hotplug_detected (mon,HOTPLUG_TIMEOUT )); - igt_assert_eq(reprobe_connector(data, port), + igt_assert_eq(update_connector(data, port, false),tests/chamelium.c +1
-1DRM_MODE_DISCONNECTED); }@@ -204,7 +206,7 @@ test_edid_read(data_t *data, struct chamelium_port *port,chamelium_port_set_edid (data->chamelium, port, edid_id);chamelium_plug (data->chamelium, port); -wait_for_connector (data, port,DRM_MODE_CONNECTED ); +wait_for_connector (data, port,DRM_MODE_CONNECTED , true); igt_assert(kmstest_get_property(data->drm_fd, connector-Quoted 1 line
connector_id,
DRM_MODE_OBJECT_CONNECTOR,
"EDID", NULL,tests/chamelium.c +0
-1@@ -247,13 +249,13 @@ try_suspend_resume_hpd(data_t *data, structchamelium_port *port,igt_assert (igt_hotplug_detected (mon ,HOTPLUG_TIMEOUT ));if (port) { - igt_assert_eq(reprobe_connector(data, port),connected ?
tests/chamelium.c +1
-0+ igt_assert_eq(update_connector(data, port, false),connected ?
DRM_MODE_DISCONNECTED:DRM_MODE_CONNECTED);tests/chamelium.c +0
-1}else {for (p =0 ; p < data->port_count; p++) { port = data->ports[p]; - igt_assert_eq(reprobe_connector(data, port),connected ?
tests/chamelium.c +1
-1- DRM_MODE_DISCONNECTED : + igt_assert_eq(update_connector(data, port,false),
tests/chamelium.c +1
-0+ connected ?
DRM_MODE_DISCONNECTED:tests/chamelium.c +2
-2DRM_MODE_CONNECTED); }@@ -317,7 +319,7 @@ test_suspend_resume_edid_change(data_t *data,struct chamelium_port *port,/* First plug in the port */ chamelium_port_set_edid(data->chamelium, port, edid_id);chamelium_plug (data->chamelium, port); -wait_for_connector (data, port,DRM_MODE_CONNECTED ); +wait_for_connector (data, port,DRM_MODE_CONNECTED , true);igt_flush_hotplugs (mon);@@ -352,7 +354,7 @@ prepare_output(data_t *data,chamelium_port_set_edid (data->chamelium, port, data- > edid_id);chamelium_plug (data->chamelium, port); -wait_for_connector (data, port,DRM_MODE_CONNECTED ); +wait_for_connector (data, port,DRM_MODE_CONNECTED , true);tests/chamelium.c +1
-1igt_display_init (display, data->drm_fd); output =igt_output_from_connector (display, connector);@@ -590,7 +592,7 @@ test_hpd_without_ddc(data_t *data, struct chamelium_port *port) chamelium_plug(data->chamelium, port);igt_assert (igt_hotplug_detected (mon,HOTPLUG_TIMEOUT )); -igt_assert_eq (reprobe_connector (data, port), DRM_MODE_CONNECTED); +igt_assert_eq (update_connector (data, port, false),DRM_MODE_CONNECTED );
igt_cleanup_hotplug(mon);
}
Signature · 6 lines
Paul Kocialkowski <[email protected]> Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH i-g-t v2 6/7] tests/chamelium: Disconnect connectors without extra reset
In reply to Lyude PaulQuoted 2 lines · Lyude Paul
NAK, I'd rather just go with the idea you had with removing the connector reset in
chamelium_init()
Okay then, I'll craft v3 in that directon. This is not a big overhead anyways, and it does not change anything when running subtests separately (which is what most test infrastructures using igt seem to be doing).
Quoted 123 lines · Paul Kocialkowski
Quoted 122 lines
This removes the reset call from the
reset_statefunction and renames it
todisconnect_connector. Since a call to reset is already done inchamelium_init, there is no need to do an extra reset in each test.This allows reducing the execution time a bit.
Signed-off-by Paul Kocialkowski <[email protected]>--- tests/chamelium.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)tests/chamelium.c +3
-3@@ -145,17 +145,17 @@ wait_for_connector(data_t *data, struct chamelium_port *port, }static void -reset_state (data_t *data,struct chamelium_port *port) +disconnect_connector (data_t *data,struct chamelium_port *port) {int p; -chamelium_reset (data->chamelium); -if (port) { +chamelium_unplug (data->chamelium, port);wait_for_connector (data, port,DRM_MODE_DISCONNECTED , false); }else {for (p =0 ; p < data->port_count; p++) { port = data->ports[p]; +chamelium_unplug (data->chamelium, port); wait_for_connector(data, port,
DRM_MODE_DISCONNECTED,tests/chamelium.c +1
-1false); }@@ -168,7 +168,7 @@ test_basic_hotplug(data_t *data, struct chamelium_port *port, int toggle_count)struct udev_monitor *mon =igt_watch_hotplug ();int i; -reset_state (data,NULL ); +disconnect_connector (data,NULL );igt_hpd_storm_set_threshold (data->drm_fd,0 );tests/chamelium.c +1
-1for (i =0 ; i < toggle_count; i++) {@@ -202,7 +202,7 @@ test_edid_read(data_t *data, struct chamelium_port *port, data->chamelium, port, false);uint64_t edid_blob_id; -reset_state (data, port); +disconnect_connector (data, port);chamelium_port_set_edid (data->chamelium, port, edid_id);tests/chamelium.c +1
-1chamelium_plug (data->chamelium, port);@@ -270,7 +270,7 @@ test_suspend_resume_hpd(data_t *data, struct chamelium_port *port, {struct udev_monitor *mon =igt_watch_hotplug (); -reset_state (data, port); +disconnect_connector (data, port);/* Make sure we notice new connectors after resuming */ tests/chamelium.c +1
-1try_suspend_resume_hpd (data, port, state, test, mon, false);@@ -294,7 +294,7 @@ test_suspend_resume_hpd_common(data_t *data, enum igt_suspend_state state, igt_debug("Testing port %s\n", chamelium_port_get_name(port)); } -reset_state (data,NULL ); +disconnect_connector (data,NULL );tests/chamelium.c +1
-1/* Make sure we notice new connectors after resuming */ try_suspend_resume_hpd (data,NULL , state, test, mon, false);@@ -314,7 +314,7 @@ test_suspend_resume_edid_change(data_t *data, struct chamelium_port *port, {struct udev_monitor *mon =igt_watch_hotplug (); -reset_state (data, port); +disconnect_connector (data, port);/* First plug in the port */ tests/chamelium.c +1
-1chamelium_port_set_edid (data->chamelium, port, edid_id);@@ -582,7 +582,7 @@ test_hpd_without_ddc(data_t *data, struct chamelium_port *port) {struct udev_monitor *mon =igt_watch_hotplug (); -reset_state (data, port); +disconnect_connector (data, port);igt_flush_hotplugs (mon);/* Disable the DDC on the connector and make sure we still
get atests/chamelium.c +1
-1@@ -604,7 +604,7 @@ test_hpd_storm_detect(data_t *data, struct chamelium_port *port, int width) int count = 0;igt_require_hpd_storm_ctl (data->drm_fd); -reset_state (data, port); +disconnect_connector (data, port);igt_hpd_storm_set_threshold (data->drm_fd,1 );tests/chamelium.c +1
-1chamelium_fire_hpd_pulses (data->chamelium, port, width,10 );@@ -629,7 +629,7 @@ static void test_hpd_storm_disable(data_t *data, struct chamelium_port *port, int width) {igt_require_hpd_storm_ctl (data->drm_fd); -reset_state (data, port); +disconnect_connector (data, port);igt_hpd_storm_set_threshold (data->drm_fd,0 );chamelium_fire_hpd_pulses(data->chamelium, port,
Signature · 6 lines
Paul Kocialkowski <[email protected]> Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx