diff options
| author | José Roberto de Souza <jose.souza@intel.com> | 2019-01-11 17:10:57 -0800 |
|---|---|---|
| committer | José Roberto de Souza <jose.souza@intel.com> | 2019-01-22 14:09:29 -0800 |
| commit | 0f77a168f580dda25fca91727b6125a4674b44aa (patch) | |
| tree | 7332cdf23d5853c679cb03e00900ebffe1313d1d /tests/kms_psr.c | |
| parent | 13ac931a33f9ce43273af0232fa33ad122c3fa07 (diff) | |
test/psr: Add a generic function to setup each test
When the PSR2 tests were added it will be necessary switch between
PSR versions, so lets add test_setup() and make it call
setup_test_plane() and assert if PSR is active as it is the base for
every test.
Cc: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Reviewed-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Signed-off-by: José Roberto de Souza <jose.souza@intel.com>
Diffstat (limited to 'tests/kms_psr.c')
| -rw-r--r-- | tests/kms_psr.c | 35 |
1 files changed, 21 insertions, 14 deletions
diff --git a/tests/kms_psr.c b/tests/kms_psr.c index c31dc317..8f2ef89c 100644 --- a/tests/kms_psr.c +++ b/tests/kms_psr.c @@ -60,6 +60,7 @@ typedef struct { int drm_fd; int debugfs_fd; enum operations op; + int test_plane_id; uint32_t devid; uint32_t crtc_id; igt_display_t display; @@ -366,6 +367,12 @@ static void setup_test_plane(data_t *data, int test_plane) igt_display_commit(&data->display); } +static void test_setup(data_t *data) +{ + setup_test_plane(data, data->test_plane_id); + igt_assert(psr_wait_entry_if_enabled(data)); +} + static void dpms_off_on(data_t *data) { kmstest_set_connector_dpms(data->drm_fd, data->output->config.connector, @@ -424,14 +431,14 @@ int main(int argc, char *argv[]) } igt_subtest("basic") { - setup_test_plane(&data, DRM_PLANE_TYPE_PRIMARY); - igt_assert(psr_wait_entry_if_enabled(&data)); + data.test_plane_id = DRM_PLANE_TYPE_PRIMARY; + test_setup(&data); test_cleanup(&data); } igt_subtest("no_drrs") { - setup_test_plane(&data, DRM_PLANE_TYPE_PRIMARY); - igt_assert(psr_wait_entry_if_enabled(&data)); + data.test_plane_id = DRM_PLANE_TYPE_PRIMARY; + test_setup(&data); igt_assert(drrs_disabled(&data)); test_cleanup(&data); } @@ -439,8 +446,8 @@ int main(int argc, char *argv[]) for (op = PAGE_FLIP; op <= RENDER; op++) { igt_subtest_f("primary_%s", op_str(op)) { data.op = op; - setup_test_plane(&data, DRM_PLANE_TYPE_PRIMARY); - igt_assert(psr_wait_entry_if_enabled(&data)); + data.test_plane_id = DRM_PLANE_TYPE_PRIMARY; + test_setup(&data); run_test(&data); test_cleanup(&data); } @@ -449,8 +456,8 @@ int main(int argc, char *argv[]) for (op = MMAP_GTT; op <= PLANE_ONOFF; op++) { igt_subtest_f("sprite_%s", op_str(op)) { data.op = op; - setup_test_plane(&data, DRM_PLANE_TYPE_OVERLAY); - igt_assert(psr_wait_entry_if_enabled(&data)); + data.test_plane_id = DRM_PLANE_TYPE_OVERLAY; + test_setup(&data); run_test(&data); test_cleanup(&data); } @@ -459,8 +466,8 @@ int main(int argc, char *argv[]) for (op = MMAP_GTT; op <= PLANE_ONOFF; op++) { igt_subtest_f("cursor_%s", op_str(op)) { data.op = op; - setup_test_plane(&data, DRM_PLANE_TYPE_CURSOR); - igt_assert(psr_wait_entry_if_enabled(&data)); + data.test_plane_id = DRM_PLANE_TYPE_CURSOR; + test_setup(&data); run_test(&data); test_cleanup(&data); } @@ -468,8 +475,8 @@ int main(int argc, char *argv[]) igt_subtest_f("dpms") { data.op = RENDER; - setup_test_plane(&data, DRM_PLANE_TYPE_PRIMARY); - igt_assert(psr_wait_entry_if_enabled(&data)); + data.test_plane_id = DRM_PLANE_TYPE_PRIMARY; + test_setup(&data); dpms_off_on(&data); run_test(&data); test_cleanup(&data); @@ -477,8 +484,8 @@ int main(int argc, char *argv[]) igt_subtest_f("suspend") { data.op = PLANE_ONOFF; - setup_test_plane(&data, DRM_PLANE_TYPE_CURSOR); - igt_assert(psr_wait_entry_if_enabled(&data)); + data.test_plane_id = DRM_PLANE_TYPE_CURSOR; + test_setup(&data); igt_system_suspend_autoresume(SUSPEND_STATE_MEM, SUSPEND_TEST_NONE); igt_assert(psr_wait_entry_if_enabled(&data)); |