[igt-dev] [PATCH i-g-t v3 5/6] tests/fbcon_fbt: Do not try to open the same driver twice as master

[Dhinakaran Pandiyan]

On Wed, 2019-04-10 at 15:07 -0700, José Roberto de Souza wrote:
> 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)
> 
> Reviewed-by: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
> Signed-off-by: José Roberto de Souza <jose.souza at intel.com>
> ---

>  
> -static void setup_environment(void)
> +static void setup_environment(struct drm_info *drm)
>  {
>  	int drm_fd;
drm is unused.

>  
> @@ -302,24 +305,28 @@ static void setup_environment(void)
>  	fbcon_blink_enable(true);
>  }
>  
> -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 = { .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);
>  }