flywithu/ntel-gpu-tools
1
0
Fork 0
mirror of https://github.com/tiagovignatti/intel-gpu-tools.git synced 2025-06-20 22:36:24 +00:00
Code Issues Releases Wiki Activity

lib/igt_kms.c: remove tests dependency on VT /dev/tty0

Browse Source 
Required to run on any recent, freon-based and X11-free ChromeOS release.

v2:
- igt_debug() instead of igt_warn()
- return KD_GRAPHICS instead of -1UL
- print previous mode in debug statements. Among others this help a tiny
  bit with the now confusing debug output ("cannot change" immediately
  followed by a misleading "mode changed").

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Marc Herbert 2015-02-24 12:29:22 -08:00 committed by Daniel Vetter
parent 7890b09348
commit c6d18ee56b
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/igt_kms.c
View File

@ -299,12 +299,26 @@ int kmstest_get_pipe_from_crtc_id(int fd, int crtc_id)
return pfci.pipe;
}
/*
* Returns: the previous mode, or KD_GRAPHICS if no /dev/tty0 was
* found and nothing was done.
*/
static signed long set_vt_mode(unsigned long mode)
{
int fd;
unsigned long prev_mode;
static const char TTY0[] = "/dev/tty0";
fd = open("/dev/tty0", O_RDONLY);
if (access(TTY0, F_OK)) {
/* errno message should be "No such file". Do not
hardcode but ask strerror() in the very unlikely
case something else happened. */
igt_debug("VT: %s: %s, cannot change its mode\n",
TTY0, strerror(errno));
return KD_GRAPHICS;
}
fd = open(TTY0, O_RDONLY);
if (fd < 0)
return -errno;
@ -336,10 +350,10 @@ void kmstest_restore_vt_mode(void)
if (orig_vt_mode != -1UL) {
ret = set_vt_mode(orig_vt_mode);
orig_vt_mode = -1UL;
igt_assert(ret >= 0);
igt_debug("VT: original mode restored\n");
igt_debug("VT: original mode 0x%lx restored\n", orig_vt_mode);
orig_vt_mode = -1UL;
}
}
@ -366,7 +380,7 @@ void kmstest_set_vt_graphics_mode(void)
igt_assert(ret >= 0);
orig_vt_mode = ret;
igt_debug("VT: graphics mode set\n");
igt_debug("VT: graphics mode set (mode was 0x%lx)\n", ret);
}