So give it a kmstest_ prefix and shuffle it around a bit.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
set_vt_mode(orig_vt_mode);
}
-/*
- * Set the VT to graphics mode and install an exit handler to restore the
- * original mode.
+/**
+ * kmstest_set_vt_graphics_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 igt_set_vt_graphics_mode(void)
+void kmstest_set_vt_graphics_mode(void)
{
long ret;
#include "igt_fb.h"
+/* Low-level helpers with kmstest_ prefix */
+
enum pipe {
PIPE_A = 0,
PIPE_B,
* 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 {
COMMIT_LEGACY = 0,
COMMIT_UNIVERSAL,
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_fini(igt_display_t *display);
int igt_display_commit2(igt_display_t *display, enum igt_commit_style s);
/* We assume width and height are same so max is assigned width */
igt_assert_cmpint(cursor_width, ==, cursor_height);
- igt_set_vt_graphics_mode();
+ kmstest_set_vt_graphics_mode();
igt_require_pipe_crc();
FILE *status;
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);
- igt_set_vt_graphics_mode();
+ kmstest_set_vt_graphics_mode();
data.bufmgr = drm_intel_bufmgr_gem_init(data.drm_fd, 4096);
igt_assert(data.bufmgr);
igt_enable_connectors();
- igt_set_vt_graphics_mode();
+ kmstest_set_vt_graphics_mode();
igt_install_exit_handler(kms_flip_exit_handler);
get_timestamp_format();
igt_skip_on_simulation();
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_fixture {
data.drm_fd = drm_open_any();
- igt_set_vt_graphics_mode();
+ kmstest_set_vt_graphics_mode();
igt_require_pipe_crc();
igt_display_init(&data.display, data.drm_fd);
drmModeFreeConnector(temp);
/* attempt to use the display */
- igt_set_vt_graphics_mode();
+ kmstest_set_vt_graphics_mode();
igt_display_init(&display, drm_fd);
igt_display_commit(&display);
igt_fixture {
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);
igt_enable_connectors();
- igt_set_vt_graphics_mode();
+ kmstest_set_vt_graphics_mode();
igt_require_pipe_crc();
igt_fixture {
data.drm_fd = drm_open_any();
- igt_set_vt_graphics_mode();
+ kmstest_set_vt_graphics_mode();
igt_require_pipe_crc();
igt_display_init(&data.display, data.drm_fd);
igt_fixture {
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);
devid = intel_get_drm_devid(drm_fd);
batch = intel_batchbuffer_alloc(bufmgr, devid);
- igt_set_vt_graphics_mode();
+ kmstest_set_vt_graphics_mode();
}
for (i = 0; i < ARRAY_SIZE(tests); i++) {
igt_fixture {
data.gfx_fd = drm_open_any();
- igt_set_vt_graphics_mode();
+ kmstest_set_vt_graphics_mode();
igt_require_pipe_crc();
igt_fixture {
drm_fd = drm_open_any();
if (!dry_run)
- igt_set_vt_graphics_mode();
+ kmstest_set_vt_graphics_mode();
drm_resources = drmModeGetResources(drm_fd);
igt_assert(drm_resources);
data.drm_fd = drm_open_any();
- igt_set_vt_graphics_mode();
+ kmstest_set_vt_graphics_mode();
data.resources = drmModeGetResources(data.drm_fd);
igt_assert(data.resources);
igt_fixture {
data.drm_fd = drm_open_any();
- igt_set_vt_graphics_mode();
+ kmstest_set_vt_graphics_mode();
igt_require_pipe_crc();
igt_display_init(&data.display, data.drm_fd);
intel_register_access_init(intel_get_pci_device(), 0);
- igt_set_vt_graphics_mode();
+ kmstest_set_vt_graphics_mode();
}
igt_subtest("screens-disabled")
data->devid = intel_get_drm_devid(drm_fd);
- igt_set_vt_graphics_mode();
+ kmstest_set_vt_graphics_mode();
init_modeset_cached_params(&ms_data);
}
goto out_close;
}
- igt_set_vt_graphics_mode();
+ kmstest_set_vt_graphics_mode();
mainloop = g_main_loop_new(NULL, FALSE);
if (!mainloop) {