Message ID | 20170825120337.8172-1-paul.kocialkowski@linux.intel.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
R-B'd and pushed, thanks! On Fri, 2017-08-25 at 15:03 +0300, Paul Kocialkowski wrote: > 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> > --- > tests/chamelium.c | 4 ++-- > 1 file 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);
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);
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> --- tests/chamelium.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)