[igt-dev] [PATCH i-g-t v2 7/8] tests/fbcon_fbt: Do not try to open the same driver twice as master
Maarten Lankhorst
maarten.lankhorst at linux.intel.com
Tue Apr 9 17:55:28 UTC 2019
Op 27-03-2019 om 21:03 schreef José Roberto de Souza:
> If a subtest fail before the teardown_drm() call it will keep the
> driver open as master causing the test to fail when trying to open
> the driver again as master, so lets share the drm_info struct and
> check if driver is already open.
>
> Starting subtest: psr
> (kms_fbcon_fbt:5270) CRITICAL: Test assertion failure function subtest, file ../tests/kms_fbcon_fbt.c:259:
> (kms_fbcon_fbt:5270) CRITICAL: Failed assertion: feature->wait_until_update(drm.debugfs_fd)
> Stack trace:
> #0 ../lib/igt_core.c:1474 __igt_fail_assert()
> #1 ../tests/kms_fbcon_fbt.c:261 subtest()
> #2 ../tests/kms_fbcon_fbt.c:316 __real_main309()
> #3 ../tests/kms_fbcon_fbt.c:309 main()
> #4 ../csu/libc-start.c:325 __libc_start_main()
> #5 [_start+0x29]
> #6 [<unknown>+0x0]
> Subtest psr failed.
> **** DEBUG ****
> (kms_fbcon_fbt:5270) drmtest-DEBUG: Test requirement passed: !(fd<0)
> (kms_fbcon_fbt:5270) igt_debugfs-DEBUG: Opening debugfs directory '/sys/kernel/debug/dri/1'
> (kms_fbcon_fbt:5270) DEBUG: Test requirement passed: drm->res
> (kms_fbcon_fbt:5270) igt_kms-DEBUG: VT: graphics mode set (mode was 0x0)
> (kms_fbcon_fbt:5270) DEBUG: Test requirement passed: feature->supported_on_chipset(drm.debugfs_fd)
> (kms_fbcon_fbt:5270) CRITICAL: Test assertion failure function subtest, file ../tests/kms_fbcon_fbt.c:259:
> (kms_fbcon_fbt:5270) CRITICAL: Failed assertion: feature->wait_until_update(drm.debugfs_fd)
> (kms_fbcon_fbt:5270) igt_core-INFO: Stack trace:
> (kms_fbcon_fbt:5270) igt_core-INFO: #0 ../lib/igt_core.c:1474 __igt_fail_assert()
> (kms_fbcon_fbt:5270) igt_core-INFO: #1 ../tests/kms_fbcon_fbt.c:261 subtest()
> (kms_fbcon_fbt:5270) igt_core-INFO: #2 ../tests/kms_fbcon_fbt.c:316 __real_main309()
> (kms_fbcon_fbt:5270) igt_core-INFO: #3 ../tests/kms_fbcon_fbt.c:309 main()
> (kms_fbcon_fbt:5270) igt_core-INFO: #4 ../csu/libc-start.c:325 __libc_start_main()
> (kms_fbcon_fbt:5270) igt_core-INFO: #5 [_start+0x29]
> (kms_fbcon_fbt:5270) igt_core-INFO: #6 [<unknown>+0x0]
> **** END ****
> Subtest psr: FAIL (0.845s)
> Starting subtest: fbc-suspend
> Test requirement not met in function igt_device_set_master, file ../lib/igt_device.c:55:
> Test requirement: __igt_device_set_master(fd) == 0
> Can't become DRM master, please check if no other DRM client is running.
> Subtest fbc-suspend: SKIP (0.001s)
> Starting subtest: psr-suspend
> Test requirement not met in function igt_device_set_master, file ../lib/igt_device.c:55:
> Test requirement: __igt_device_set_master(fd) == 0
> Can't become DRM master, please check if no other DRM client is running.
> Subtest psr-suspend: SKIP (0.000s)
>
> Signed-off-by: José Roberto de Souza <jose.souza at intel.com>
> ---
> tests/kms_fbcon_fbt.c | 55 +++++++++++++++++++++++++------------------
> 1 file changed, 32 insertions(+), 23 deletions(-)
>
> diff --git a/tests/kms_fbcon_fbt.c b/tests/kms_fbcon_fbt.c
> index 2f158e2f..66f214c5 100644
> --- a/tests/kms_fbcon_fbt.c
> +++ b/tests/kms_fbcon_fbt.c
> @@ -60,6 +60,9 @@ static void setup_drm(struct drm_info *drm)
> {
> int i;
>
> + if (drm->fd >= 0)
> + return;
> +
> drm->fd = drm_open_driver_master(DRIVER_INTEL);
> drm->debugfs_fd = igt_debugfs_dir(drm->fd);
>
> @@ -85,6 +88,7 @@ static void teardown_drm(struct drm_info *drm)
>
> drmModeFreeResources(drm->res);
> igt_assert(close(drm->fd) == 0);
> + drm->fd = -1;
> }
>
> static bool fbc_supported_on_chipset(int debugfs_fd)
> @@ -242,51 +246,50 @@ struct feature {
> .enable = psr_debugfs_enable,
> };
>
> -static void subtest(struct feature *feature, bool suspend)
> +static void subtest(struct drm_info *drm, struct feature *feature, bool suspend)
> {
> - struct drm_info drm;
> struct igt_fb fb;
>
> - setup_drm(&drm);
> + setup_drm(drm);
>
> - igt_require(feature->supported_on_chipset(drm.debugfs_fd));
> + igt_require(feature->supported_on_chipset(drm->debugfs_fd));
>
> - disable_features(drm.debugfs_fd);
> - feature->enable(drm.debugfs_fd);
> + disable_features(drm->debugfs_fd);
> + feature->enable(drm->debugfs_fd);
>
> - kmstest_unset_all_crtcs(drm.fd, drm.res);
> + kmstest_unset_all_crtcs(drm->fd, drm->res);
> wait_user("Modes unset.");
> - igt_assert(feature->wait_until_update(drm.debugfs_fd));
> + igt_assert(feature->wait_until_update(drm->debugfs_fd));
>
> - set_mode_for_one_screen(&drm, &fb, feature->connector_possible_fn);
> + set_mode_for_one_screen(drm, &fb, feature->connector_possible_fn);
> wait_user("Screen set.");
> - igt_assert(feature->wait_until_enabled(drm.debugfs_fd));
> + igt_assert(feature->wait_until_enabled(drm->debugfs_fd));
>
> if (suspend) {
> igt_system_suspend_autoresume(SUSPEND_STATE_MEM,
> SUSPEND_TEST_NONE);
> sleep(5);
> - igt_assert(feature->wait_until_enabled(drm.debugfs_fd));
> + igt_assert(feature->wait_until_enabled(drm->debugfs_fd));
> }
>
> - igt_remove_fb(drm.fd, &fb);
> - teardown_drm(&drm);
> + igt_remove_fb(drm->fd, &fb);
> + teardown_drm(drm);
>
> /* Wait for fbcon to restore itself. */
> sleep(3);
>
> wait_user("Back to fbcon.");
> - igt_assert(feature->wait_until_update(drm.debugfs_fd));
> + igt_assert(feature->wait_until_update(drm->debugfs_fd));
>
> if (suspend) {
> igt_system_suspend_autoresume(SUSPEND_STATE_MEM,
> SUSPEND_TEST_NONE);
> sleep(5);
> - igt_assert(feature->wait_until_update(drm.debugfs_fd));
> + igt_assert(feature->wait_until_update(drm->debugfs_fd));
> }
> }
>
> -static void setup_environment(void)
> +static void setup_environment(struct drm_info *drm)
> {
> int drm_fd;
>
> @@ -300,26 +303,32 @@ static void setup_environment(void)
> */
> bind_fbcon(true);
> fbcon_blink_enable(true);
> +
> + drm->fd = -1;
> }
>
> -static void teardown_environment(void)
> +static void teardown_environment(struct drm_info *drm)
> {
> + if (drm->fd >= 0)
> + teardown_drm(drm);
> }
>
> igt_main
> {
> + struct drm_info drm = {};
drm = { .fd = -1 }; ?
> +
> igt_fixture
> - setup_environment();
> + setup_environment(&drm);
>
> igt_subtest("fbc")
> - subtest(&fbc, false);
> + subtest(&drm, &fbc, false);
> igt_subtest("psr")
> - subtest(&psr, false);
> + subtest(&drm, &psr, false);
> igt_subtest("fbc-suspend")
> - subtest(&fbc, true);
> + subtest(&drm, &fbc, true);
> igt_subtest("psr-suspend")
> - subtest(&psr, true);
> + subtest(&drm, &psr, true);
>
> igt_fixture
> - teardown_environment();
> + teardown_environment(&drm);
> }
More information about the igt-dev
mailing list