From c76f35386c2533e9959be37feca0e80d252fec30 Mon Sep 17 00:00:00 2001 From: Thomas Wood Date: Wed, 3 Dec 2014 14:38:45 +0000 Subject: [PATCH] lib: always reset connectors after the state is forced Install the exit handler to reset connector states whenever kmstest_force_connector is called, so that the connector states are always reset even if a test fails. Signed-off-by: Thomas Wood --- lib/igt_kms.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/igt_kms.c b/lib/igt_kms.c index e6a5f917..1387d019 100644 --- a/lib/igt_kms.c +++ b/lib/igt_kms.c @@ -365,6 +365,12 @@ void kmstest_set_vt_graphics_mode(void) igt_debug("VT: graphics mode set\n"); } + +static void reset_connectors_at_exit(int sig) +{ + igt_reset_connectors(); +} + /** * kmstest_force_connector: * @fd: drm file descriptor @@ -446,6 +452,7 @@ bool kmstest_force_connector(int drm_fd, drmModeConnector *connector, tmp++; } + igt_install_exit_handler(reset_connectors_at_exit); igt_assert(ret != -1); return (ret == -1) ? false : true; @@ -1767,11 +1774,6 @@ void igt_wait_for_vblank(int drm_fd, enum pipe pipe) igt_assert(drmWaitVBlank(drm_fd, &wait_vbl) == 0); } -static void reset_connectors_at_exit(int sig) -{ - igt_reset_connectors(); -} - /** * igt_enable_connectors: * @@ -1811,8 +1813,6 @@ void igt_enable_connectors(void) drmModeFreeConnector(c); } close(drm_fd); - - igt_install_exit_handler(reset_connectors_at_exit); } /**