mirror of
https://github.com/tiagovignatti/intel-gpu-tools.git
synced 2026-08-20 04:42:53 +00:00
lib: make igt_set_vt_graphics_mode never fail
All tests agree that this is a letal failure, so no point to pass it back to callers. Also add some igt_require calls for the drm_fd where I've noticed that it's missing. Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
@@ -220,7 +220,9 @@ int main(int argc, char **argv)
|
||||
const char *cmd = "pipe A none";
|
||||
|
||||
data.drm_fd = drm_open_any();
|
||||
do_or_die(igt_set_vt_graphics_mode());
|
||||
igt_require(data.drm_fd >= 0);
|
||||
|
||||
igt_set_vt_graphics_mode();
|
||||
|
||||
display_init(&data);
|
||||
|
||||
|
||||
@@ -334,7 +334,9 @@ int main(int argc, char **argv)
|
||||
const char *cmd = "pipe A none";
|
||||
|
||||
data.drm_fd = drm_open_any();
|
||||
do_or_die(igt_set_vt_graphics_mode());
|
||||
igt_require(data.drm_fd >= 0);
|
||||
|
||||
igt_set_vt_graphics_mode();
|
||||
|
||||
igt_debugfs_init(&data.debugfs);
|
||||
data.ctl = igt_debugfs_fopen(&data.debugfs,
|
||||
|
||||
+1
-1
@@ -1493,7 +1493,7 @@ int main(int argc, char **argv)
|
||||
igt_fixture {
|
||||
drm_fd = drm_open_any();
|
||||
|
||||
do_or_die(igt_set_vt_graphics_mode());
|
||||
igt_set_vt_graphics_mode();
|
||||
do_or_die(igt_install_exit_handler(kms_flip_exit_handler));
|
||||
get_timestamp_format();
|
||||
|
||||
|
||||
+1
-1
@@ -242,7 +242,7 @@ int main(int argc, char **argv)
|
||||
devid = intel_get_drm_devid(drm_fd);
|
||||
batch = intel_batchbuffer_alloc(bufmgr, devid);
|
||||
|
||||
do_or_die(igt_set_vt_graphics_mode());
|
||||
igt_set_vt_graphics_mode();
|
||||
}
|
||||
|
||||
for (i = 0; i < ARRAY_SIZE(tests); i++) {
|
||||
|
||||
+1
-1
@@ -702,7 +702,7 @@ int main(int argc, char **argv)
|
||||
igt_fixture {
|
||||
drm_fd = drm_open_any();
|
||||
if (!dry_run)
|
||||
do_or_die(igt_set_vt_graphics_mode());
|
||||
igt_set_vt_graphics_mode();
|
||||
|
||||
drm_resources = drmModeGetResources(drm_fd);
|
||||
assert(drm_resources);
|
||||
|
||||
+1
-1
@@ -292,7 +292,7 @@ static void init_mode_set_data(struct mode_set_data *data)
|
||||
data->bufmgr = drm_intel_bufmgr_gem_init(drm_fd, 4096);
|
||||
data->devid = intel_get_drm_devid(drm_fd);
|
||||
|
||||
do_or_die(igt_set_vt_graphics_mode());
|
||||
igt_set_vt_graphics_mode();
|
||||
drm_intel_bufmgr_gem_enable_reuse(data->bufmgr);
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -801,7 +801,7 @@ int main(int argc, char **argv)
|
||||
goto out_close;
|
||||
}
|
||||
|
||||
do_or_die(igt_set_vt_graphics_mode());
|
||||
igt_set_vt_graphics_mode();
|
||||
|
||||
mainloop = g_main_loop_new(NULL, FALSE);
|
||||
if (!mainloop) {
|
||||
|
||||
Reference in New Issue
Block a user