summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorPaul Kocialkowski <paul.kocialkowski@linux.intel.com>2017-08-25 15:03:37 +0300
committerLyude <lyude@redhat.com>2017-08-25 14:23:46 -0400
commit60f6a12195395934f179d5ecc080353190d19a6c (patch)
tree375c5ecb829ef1a8d7ffdbd581567c91059379f6 /tests
parent29d488034a50cd6fbad792cae61321995f0ab51c (diff)
tests: chamelium: Eliminate reset when preparing output
Resetting the Chamelium when preparing the video output is unnecessary and significant increases the tests run-time. Since all video-related tests work just as well without it, eliminate it. This also adds a call to reset_test in the analog frame dump test, that was missing before, although the chamelium was still reset by the call to prepare_output. Signed-off-by: Paul Kocialkowski <paul.kocialkowski@linux.intel.com> Reviewed-by: Lyude Paul <lyude@redhat.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/chamelium.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/chamelium.c b/tests/chamelium.c
index 00ae484b..484bb537 100644
--- a/tests/chamelium.c
+++ b/tests/chamelium.c
@@ -417,8 +417,6 @@ prepare_output(data_t *data,
drmModeConnector *connector =
chamelium_port_get_connector(data->chamelium, port, false);
- chamelium_reset(data->chamelium);
-
igt_assert(res = drmModeGetResources(data->drm_fd));
kmstest_unset_all_crtcs(data->drm_fd, res);
@@ -626,6 +624,8 @@ test_analog_frame_dump(data_t *data, struct chamelium_port *port)
int fb_id, i;
bool bridge;
+ reset_state(data, port);
+
output = prepare_output(data, &display, port);
connector = chamelium_port_get_connector(data->chamelium, port, false);
primary = igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY);