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

lib/igt_kms: set_vt_graphics_mode is a low-level helper

Browse Source 
So give it a kmstest_ prefix and shuffle it around a bit.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Daniel Vetter 2014-08-12 11:23:09 +02:00
parent 9a15b5a5e2
commit 33f0884f3c
21 changed files with 34 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/igt_kms.c
View File

@ -287,12 +287,16 @@ static void restore_vt_mode_at_exit(int sig)
set_vt_mode(orig_vt_mode); set_vt_mode(orig_vt_mode);
} }
/* /**
* Set the VT to graphics mode and install an exit handler to restore the * kmstest_set_vt_graphics_mode:
* original mode. *
* Sets the controlling VT (if available) into graphics/raw mode and installs an
* igt exit handler to set the VT back to text mode on exit.
*
* All kms tests must call this function to make sure that the fbcon doesn't
* interfere by e.g. blanking the screen.
*/ */
void kmstest_set_vt_graphics_mode(void)
void igt_set_vt_graphics_mode(void)
{ {
long ret; long ret;

9
lib/igt_kms.h
View File

@ -36,6 +36,8 @@
#include "igt_fb.h" #include "igt_fb.h"
/* Low-level helpers with kmstest_ prefix */
enum pipe { enum pipe {
PIPE_A = 0, PIPE_A = 0,
PIPE_B, PIPE_B,
@ -163,6 +165,10 @@ void kmstest_unset_all_crtcs(int drm_fd, drmModeResPtr resources);
* A small modeset API * A small modeset API
*/ */
/* set vt into graphics mode, required to prevent fbcon from interfering */
void kmstest_set_vt_graphics_mode(void);
/* High-level kms api with igt_ prefix */
enum igt_commit_style { enum igt_commit_style {
COMMIT_LEGACY = 0, COMMIT_LEGACY = 0,
COMMIT_UNIVERSAL, COMMIT_UNIVERSAL,
@ -239,9 +245,6 @@ struct igt_display {
bool has_universal_planes; bool has_universal_planes;
}; };
/* set vt into graphics mode, required to prevent fbcon from interfering */
void igt_set_vt_graphics_mode(void);
void igt_display_init(igt_display_t *display, int drm_fd); void igt_display_init(igt_display_t *display, int drm_fd);
void igt_display_fini(igt_display_t *display); void igt_display_fini(igt_display_t *display);
int igt_display_commit2(igt_display_t *display, enum igt_commit_style s); int igt_display_commit2(igt_display_t *display, enum igt_commit_style s);

2
tests/kms_cursor_crc.c
View File

@ -440,7 +440,7 @@ igt_main
/* We assume width and height are same so max is assigned width */ /* We assume width and height are same so max is assigned width */
igt_assert_cmpint(cursor_width, ==, cursor_height); igt_assert_cmpint(cursor_width, ==, cursor_height);
igt_set_vt_graphics_mode(); kmstest_set_vt_graphics_mode();
igt_require_pipe_crc(); igt_require_pipe_crc();

2
tests/kms_fbc_crc.c
View File

@ -499,7 +499,7 @@ igt_main
FILE *status; FILE *status;
data.drm_fd = drm_open_any(); data.drm_fd = drm_open_any();
igt_set_vt_graphics_mode(); kmstest_set_vt_graphics_mode();
data.devid = intel_get_drm_devid(data.drm_fd); data.devid = intel_get_drm_devid(data.drm_fd);

2
tests/kms_fence_pin_leak.c
View File

@ -216,7 +216,7 @@ igt_simple_main
data.devid = intel_get_drm_devid(data.drm_fd); data.devid = intel_get_drm_devid(data.drm_fd);
igt_set_vt_graphics_mode(); kmstest_set_vt_graphics_mode();
data.bufmgr = drm_intel_bufmgr_gem_init(data.drm_fd, 4096); data.bufmgr = drm_intel_bufmgr_gem_init(data.drm_fd, 4096);
igt_assert(data.bufmgr); igt_assert(data.bufmgr);

2
tests/kms_flip.c
View File

@ -1596,7 +1596,7 @@ int main(int argc, char **argv)
igt_enable_connectors(); igt_enable_connectors();
igt_set_vt_graphics_mode(); kmstest_set_vt_graphics_mode();
igt_install_exit_handler(kms_flip_exit_handler); igt_install_exit_handler(kms_flip_exit_handler);
get_timestamp_format(); get_timestamp_format();

2
tests/kms_flip_event_leak.c
View File

@ -115,7 +115,7 @@ igt_simple_main
igt_skip_on_simulation(); igt_skip_on_simulation();
data.drm_fd = drm_open_any(); data.drm_fd = drm_open_any();
igt_set_vt_graphics_mode(); kmstest_set_vt_graphics_mode();
igt_display_init(&data.display, data.drm_fd); igt_display_init(&data.display, data.drm_fd);

2
tests/kms_flip_tiling.c
View File

@ -128,7 +128,7 @@ igt_main
igt_fixture { igt_fixture {
data.drm_fd = drm_open_any(); data.drm_fd = drm_open_any();
igt_set_vt_graphics_mode(); kmstest_set_vt_graphics_mode();
igt_require_pipe_crc(); igt_require_pipe_crc();
igt_display_init(&data.display, data.drm_fd); igt_display_init(&data.display, data.drm_fd);

2
tests/kms_force_connector.c
View File

@ -64,7 +64,7 @@ main (int argc, char **argv)
drmModeFreeConnector(temp); drmModeFreeConnector(temp);
/* attempt to use the display */ /* attempt to use the display */
igt_set_vt_graphics_mode(); kmstest_set_vt_graphics_mode();
igt_display_init(&display, drm_fd); igt_display_init(&display, drm_fd);
igt_display_commit(&display); igt_display_commit(&display);

2
tests/kms_mmio_vs_cs_flip.c
View File

@ -546,7 +546,7 @@ igt_main
igt_fixture { igt_fixture {
data.drm_fd = drm_open_any(); data.drm_fd = drm_open_any();
igt_set_vt_graphics_mode(); kmstest_set_vt_graphics_mode();
data.devid = intel_get_drm_devid(data.drm_fd); data.devid = intel_get_drm_devid(data.drm_fd);

2
tests/kms_pipe_crc_basic.c
View File

@ -233,7 +233,7 @@ igt_main
igt_enable_connectors(); igt_enable_connectors();
igt_set_vt_graphics_mode(); kmstest_set_vt_graphics_mode();
igt_require_pipe_crc(); igt_require_pipe_crc();

2
tests/kms_plane.c
View File

@ -381,7 +381,7 @@ igt_main
igt_fixture { igt_fixture {
data.drm_fd = drm_open_any(); data.drm_fd = drm_open_any();
igt_set_vt_graphics_mode(); kmstest_set_vt_graphics_mode();
igt_require_pipe_crc(); igt_require_pipe_crc();
igt_display_init(&data.display, data.drm_fd); igt_display_init(&data.display, data.drm_fd);

2
tests/kms_psr_sink_crc.c
View File

@ -592,7 +592,7 @@ igt_main
igt_fixture { igt_fixture {
data.drm_fd = drm_open_any(); data.drm_fd = drm_open_any();
igt_set_vt_graphics_mode(); kmstest_set_vt_graphics_mode();
data.devid = intel_get_drm_devid(data.drm_fd); data.devid = intel_get_drm_devid(data.drm_fd);

2
tests/kms_render.c
View File

@ -236,7 +236,7 @@ igt_main
devid = intel_get_drm_devid(drm_fd); devid = intel_get_drm_devid(drm_fd);
batch = intel_batchbuffer_alloc(bufmgr, devid); batch = intel_batchbuffer_alloc(bufmgr, devid);
igt_set_vt_graphics_mode(); kmstest_set_vt_graphics_mode();
} }
for (i = 0; i < ARRAY_SIZE(tests); i++) { for (i = 0; i < ARRAY_SIZE(tests); i++) {

2
tests/kms_rotation_crc.c
View File

@ -195,7 +195,7 @@ igt_main
igt_fixture { igt_fixture {
data.gfx_fd = drm_open_any(); data.gfx_fd = drm_open_any();
igt_set_vt_graphics_mode(); kmstest_set_vt_graphics_mode();
igt_require_pipe_crc(); igt_require_pipe_crc();

2
tests/kms_setmode.c
View File

@ -714,7 +714,7 @@ int main(int argc, char **argv)
igt_fixture { igt_fixture {
drm_fd = drm_open_any(); drm_fd = drm_open_any();
if (!dry_run) if (!dry_run)
igt_set_vt_graphics_mode(); kmstest_set_vt_graphics_mode();
drm_resources = drmModeGetResources(drm_fd); drm_resources = drmModeGetResources(drm_fd);
igt_assert(drm_resources); igt_assert(drm_resources);

2
tests/kms_sink_crc_basic.c
View File

@ -180,7 +180,7 @@ igt_simple_main
data.drm_fd = drm_open_any(); data.drm_fd = drm_open_any();
igt_set_vt_graphics_mode(); kmstest_set_vt_graphics_mode();
data.resources = drmModeGetResources(data.drm_fd); data.resources = drmModeGetResources(data.drm_fd);
igt_assert(data.resources); igt_assert(data.resources);

2
tests/kms_universal_plane.c
View File

@ -561,7 +561,7 @@ igt_main
igt_fixture { igt_fixture {
data.drm_fd = drm_open_any(); data.drm_fd = drm_open_any();
igt_set_vt_graphics_mode(); kmstest_set_vt_graphics_mode();
igt_require_pipe_crc(); igt_require_pipe_crc();
igt_display_init(&data.display, data.drm_fd); igt_display_init(&data.display, data.drm_fd);

2
tests/pm_lpsp.c
View File

@ -245,7 +245,7 @@ igt_main
intel_register_access_init(intel_get_pci_device(), 0); intel_register_access_init(intel_get_pci_device(), 0);
igt_set_vt_graphics_mode(); kmstest_set_vt_graphics_mode();
} }
igt_subtest("screens-disabled") igt_subtest("screens-disabled")

2
tests/pm_rpm.c
View File

@ -404,7 +404,7 @@ static void init_mode_set_data(struct mode_set_data *data)
data->devid = intel_get_drm_devid(drm_fd); data->devid = intel_get_drm_devid(drm_fd);
igt_set_vt_graphics_mode(); kmstest_set_vt_graphics_mode();
init_modeset_cached_params(&ms_data); init_modeset_cached_params(&ms_data);
} }

2
tests/testdisplay.c
View File

@ -849,7 +849,7 @@ int main(int argc, char **argv)
goto out_close; goto out_close;
} }
igt_set_vt_graphics_mode(); kmstest_set_vt_graphics_mode();
mainloop = g_main_loop_new(NULL, FALSE); mainloop = g_main_loop_new(NULL, FALSE);
if (!mainloop) { if (!mainloop) {