summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYi Sun <yi.sun@intel.com>2015-03-06 15:52:55 +0800
committerYi Sun <yi.sun@intel.com>2015-03-06 15:53:30 +0800
commit444acc53106e26e05b3a35e9501f31364d31bde6 (patch)
treebfad7865d35fcedf4b530dffca7e527a78d0b378
parentc9f6fc5585acfad91f3c4f918fd62b8c37209a80 (diff)
Remove VT handling and setting, kidding out of the console freeze issue.
-rw-r--r--tests/testdisplay.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/tests/testdisplay.c b/tests/testdisplay.c
index 35a39f9..48e4328 100644
--- a/tests/testdisplay.c
+++ b/tests/testdisplay.c
@@ -381,7 +381,7 @@ int main(int argc, char **argv)
{ 0, 0, 0, 0 }
};
- igt_skip_on_simulation();
+// igt_skip_on_simulation();
enter_exec_path( argv );
@@ -416,14 +416,14 @@ int main(int argc, char **argv)
}
}
- set_termio_mode();
+// set_termio_mode();
if (!test_all_modes && !test_preferred_mode )
test_all_modes = 1;
drm_fd = drm_open_any();
- kmstest_set_vt_graphics_mode();
+// kmstest_set_vt_graphics_mode();
mainloop = g_main_loop_new(NULL, FALSE);
if (!mainloop) {
@@ -432,16 +432,16 @@ int main(int argc, char **argv)
goto out_close;
}
- if (!testdisplay_setup_hotplug()) {
- igt_warn("failed to initialize hotplug support\n");
- goto out_mainloop;
- }
+// if (!testdisplay_setup_hotplug()) {
+// igt_warn("failed to initialize hotplug support\n");
+// goto out_mainloop;
+// }
stdinchannel = g_io_channel_unix_new(0);
- if (!stdinchannel) {
- igt_warn("failed to create stdin GIO channel\n");
- goto out_hotplug;
- }
+// if (!stdinchannel) {
+// igt_warn("failed to create stdin GIO channel\n");
+// goto out_hotplug;
+// }
ret = g_io_add_watch(stdinchannel, G_IO_IN | G_IO_ERR, input_event,
NULL);
@@ -464,8 +464,8 @@ int main(int argc, char **argv)
out_stdio:
g_io_channel_shutdown(stdinchannel, TRUE, NULL);
-out_hotplug:
- testdisplay_cleanup_hotplug();
+//out_hotplug:
+// testdisplay_cleanup_hotplug();
out_mainloop:
g_main_loop_unref(mainloop);
out_close: