diff options
| author | Paul Kocialkowski <paul.kocialkowski@linux.intel.com> | 2017-07-03 15:01:12 +0300 |
|---|---|---|
| committer | Lyude <lyude@redhat.com> | 2017-07-06 11:42:40 -0400 |
| commit | 80aa69fd675bce77dda751e5e5c5d651e9f08e1e (patch) | |
| tree | e91cf5ea36564dfdedcd6c1b50342684d3313fb1 | |
| parent | ec91c56e2a480ce469e9f7d5a184c131442bf65a (diff) | |
chamelium: Remove init reset duplicate in favor of per-test reset
Since most tests are already doing a reset, there is no need to
duplicate it at init time. This removes that duplicate reset and adds
a call to reset_state where in-test resets where not done previously.
Signed-off-by: Paul Kocialkowski <paul.kocialkowski@linux.intel.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
| -rw-r--r-- | lib/igt_chamelium.c | 2 | ||||
| -rw-r--r-- | tests/chamelium.c | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/lib/igt_chamelium.c b/lib/igt_chamelium.c index 225f98c3..624f448b 100644 --- a/lib/igt_chamelium.c +++ b/lib/igt_chamelium.c @@ -1233,8 +1233,6 @@ struct chamelium *chamelium_init(int drm_fd) if (!chamelium_read_config(chamelium, drm_fd)) goto error; - chamelium_reset(chamelium); - cleanup_instance = chamelium; igt_install_exit_handler(chamelium_exit_handler); diff --git a/tests/chamelium.c b/tests/chamelium.c index b412c6a7..0da010ab 100644 --- a/tests/chamelium.c +++ b/tests/chamelium.c @@ -429,6 +429,8 @@ test_display_crc_single(data_t *data, struct chamelium_port *port) drmModeConnector *connector; int fb_id, i; + 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); @@ -483,6 +485,8 @@ test_display_crc_multiple(data_t *data, struct chamelium_port *port) drmModeConnector *connector; int fb_id, i, j, captured_frame_count; + 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); @@ -542,6 +546,8 @@ test_display_frame_dump(data_t *data, struct chamelium_port *port) drmModeConnector *connector; int fb_id, i, j; + 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); |