tests/kms_force_connector: split into subtests

v2: fix the initial mode count

Signed-off-by: Thomas Wood <thomas.wood@intel.com>
This commit is contained in:
Thomas Wood 2014-10-08 14:49:36 +01:00
parent 273a06dc9b
commit 43da3e706b

View File

@ -30,18 +30,16 @@
IGT_TEST_DESCRIPTION("Check the debugfs force connector/edid features work" IGT_TEST_DESCRIPTION("Check the debugfs force connector/edid features work"
" correctly."); " correctly.");
int igt_main
main (int argc, char **argv)
{ {
/* force the VGA output and test that it worked */ /* force the VGA output and test that it worked */
int drm_fd; int drm_fd = 0;
drmModeRes *res; drmModeRes *res;
drmModeConnector *vga_connector, *temp; drmModeConnector *vga_connector = NULL, *temp;
igt_display_t display; igt_display_t display;
int start_n_modes; int start_n_modes;
igt_simple_init(argc, argv); igt_fixture {
drm_fd = drm_open_any_master(); drm_fd = drm_open_any_master();
res = drmModeGetResources(drm_fd); res = drmModeGetResources(drm_fd);
@ -59,24 +57,48 @@ main (int argc, char **argv)
} }
igt_require(vga_connector); igt_require(vga_connector);
}
igt_subtest("force-connector-state") {
/* force the connector on and check the reported values */ /* force the connector on and check the reported values */
kmstest_force_connector(drm_fd, vga_connector, FORCE_CONNECTOR_ON); kmstest_force_connector(drm_fd, vga_connector, FORCE_CONNECTOR_ON);
temp = drmModeGetConnector(drm_fd, vga_connector->connector_id); temp = drmModeGetConnector(drm_fd, vga_connector->connector_id);
igt_assert(temp->connection == DRM_MODE_CONNECTED); igt_assert(temp->connection == DRM_MODE_CONNECTED);
igt_assert(temp->count_modes > 0); igt_assert(temp->count_modes > 0);
start_n_modes = temp->count_modes;
drmModeFreeConnector(temp); drmModeFreeConnector(temp);
/* attempt to use the display */ /* attempt to use the display */
kmstest_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);
/* force the connector off */
kmstest_force_connector(drm_fd, vga_connector,
FORCE_CONNECTOR_OFF);
temp = drmModeGetConnector(drm_fd, vga_connector->connector_id);
igt_assert(temp->connection == DRM_MODE_DISCONNECTED);
igt_assert(temp->count_modes == 0);
drmModeFreeConnector(temp);
/* check that the previous state is restored */
kmstest_force_connector(drm_fd, vga_connector,
FORCE_CONNECTOR_UNSPECIFIED);
temp = drmModeGetConnector(drm_fd, vga_connector->connector_id);
igt_assert(temp->connection == vga_connector->connection);
drmModeFreeConnector(temp);
}
igt_subtest("force-edid") {
kmstest_force_connector(drm_fd, vga_connector,
FORCE_CONNECTOR_ON);
temp = drmModeGetConnector(drm_fd, vga_connector->connector_id);
start_n_modes = temp->count_modes;
drmModeFreeConnector(temp);
/* test edid forcing */ /* test edid forcing */
kmstest_force_edid(drm_fd, vga_connector, generic_edid[EDID_FHD], kmstest_force_edid(drm_fd, vga_connector,
EDID_LENGTH); generic_edid[EDID_FHD], EDID_LENGTH);
temp = drmModeGetConnector(drm_fd, vga_connector->connector_id); temp = drmModeGetConnector(drm_fd, vga_connector->connector_id);
igt_assert(temp->count_modes == 1); igt_assert(temp->count_modes == 1);
@ -87,8 +109,8 @@ main (int argc, char **argv)
drmModeFreeConnector(temp); drmModeFreeConnector(temp);
/* custom edid */ /* custom edid */
kmstest_force_edid(drm_fd, vga_connector, generic_edid[EDID_WSXGA], kmstest_force_edid(drm_fd, vga_connector,
EDID_LENGTH); generic_edid[EDID_WSXGA], EDID_LENGTH);
temp = drmModeGetConnector(drm_fd, vga_connector->connector_id); temp = drmModeGetConnector(drm_fd, vga_connector->connector_id);
igt_assert(temp->count_modes == 1); igt_assert(temp->count_modes == 1);
@ -101,27 +123,18 @@ main (int argc, char **argv)
/* remove edid */ /* remove edid */
kmstest_force_edid(drm_fd, vga_connector, NULL, 0); kmstest_force_edid(drm_fd, vga_connector, NULL, 0);
temp = drmModeGetConnector(drm_fd, vga_connector->connector_id); temp = drmModeGetConnector(drm_fd, vga_connector->connector_id);
/* the connector should now have the same number of modes that it /* the connector should now have the same number of modes that
* started with */ * it started with */
igt_assert(temp->count_modes == start_n_modes); igt_assert(temp->count_modes == start_n_modes);
drmModeFreeConnector(temp); drmModeFreeConnector(temp);
/* force the connector off */
kmstest_force_connector(drm_fd, vga_connector, FORCE_CONNECTOR_OFF);
temp = drmModeGetConnector(drm_fd, vga_connector->connector_id);
igt_assert(temp->connection == DRM_MODE_DISCONNECTED);
igt_assert(temp->count_modes == 0);
drmModeFreeConnector(temp);
/* check that the previous state is restored */
kmstest_force_connector(drm_fd, vga_connector, kmstest_force_connector(drm_fd, vga_connector,
FORCE_CONNECTOR_UNSPECIFIED); FORCE_CONNECTOR_UNSPECIFIED);
temp = drmModeGetConnector(drm_fd, vga_connector->connector_id); }
igt_assert(temp->connection == vga_connector->connection);
drmModeFreeConnector(temp);
igt_fixture {
drmModeFreeConnector(vga_connector); drmModeFreeConnector(vga_connector);
}
igt_exit(); igt_exit();
} }