flywithu/ntel-gpu-tools
1
0
Fork 0
mirror of https://github.com/tiagovignatti/intel-gpu-tools.git synced 2026-08-19 20:33:01 +00:00
Code Issues Releases Wiki Activity

lib: make igt_set_vt_graphics_mode never fail

Browse Source 
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:
Daniel Vetter
2013-10-31 17:02:41 +01:00
parent 0369fe19b8
commit 1f0cf2df85
9 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/drmtest.c
+3 -4
View File
@@ -2111,10 +2111,9 @@ static void restore_vt_mode_at_exit(int sig)
* original mode.
*/
int igt_set_vt_graphics_mode(void)
void igt_set_vt_graphics_mode(void)
{
if (igt_install_exit_handler(restore_vt_mode_at_exit))
return -1;
do_or_die(igt_install_exit_handler(restore_vt_mode_at_exit));
igt_disable_exit_handler();
orig_vt_mode = set_vt_mode(KD_GRAPHICS);
@@ -2122,7 +2121,7 @@ int igt_set_vt_graphics_mode(void)
orig_vt_mode = -1UL;
igt_enable_exit_handler();
return orig_vt_mode < 0 ? -1 : 0;
igt_assert(orig_vt_mode >= 0);
}
int kmstest_get_connector_default_mode(int drm_fd, drmModeConnector *connector,
lib/drmtest.h
+1 -1
View File
@@ -394,7 +394,7 @@ void igt_enable_exit_handler(void);
void igt_disable_exit_handler(void);
/* set vt into graphics mode, required to prevent fbcon from interfering */
int igt_set_vt_graphics_mode(void);
void igt_set_vt_graphics_mode(void);
/* prefault disabling, needs the corresponding debugfs interface */
void igt_disable_prefault(void);