[PATCH i-g-t 2/2] tests/kms: Simplify DRM debug severity update

[Jani Nikula]

On Mon, 10 Mar 2025, Pranay Samala <pranay.samala at intel.com> wrote:
> This fixes directly sends the bits to be include in the
> DRM debug mask using "igt_drm_debug_severity_update(DRM_UT_KMS)".

That category alone is not enough for the test. In general, we ask bug
reporters to use something like 0x1e mask for drm.debug. Maybe we can
reduce from that for specific tests, but KMS alone is not enough.

> If any other verbosity is needed then it can also be
> included doing bitwise OR in the parametes.

Perhaps, but the interface becomes cumbersome to use. And the function's
parameter indicates a single enum, not a mask of enumerators.

And the interface doesn't support a test using different sets of
categories for different parts of the test, if so desired.

BR,
Jani.

> Fixes: a2ab0ec12ef4 ("tests/kms_atomic_transition: Reducing debug loglevel dynamically")
> Fixes: 4baeb7397d71 ("tests/intel/kms_dp_linktrain_fallback: Reduce debug loglevel dynamically")
> Fixes: 7a8a3744466f ("tests/kms_cursor_legacy: Reduce debug loglevel dynamically")
> Signed-off-by: Pranay Samala <pranay.samala at intel.com>
> ---
>  tests/intel/kms_dp_linktrain_fallback.c | 12 +++---------
>  tests/kms_atomic_transition.c           | 11 +----------
>  tests/kms_cursor_legacy.c               | 10 +---------
>  3 files changed, 5 insertions(+), 28 deletions(-)
>
> diff --git a/tests/intel/kms_dp_linktrain_fallback.c b/tests/intel/kms_dp_linktrain_fallback.c
> index 6a872efd2..66687a3d2 100644
> --- a/tests/intel/kms_dp_linktrain_fallback.c
> +++ b/tests/intel/kms_dp_linktrain_fallback.c
> @@ -613,7 +613,6 @@ igt_main
>  	data_t data = {};
>  
>  	igt_fixture {
> -		int dir, current_log_level;
>  		data.drm_fd = drm_open_driver_master(DRIVER_INTEL |
>  						     DRIVER_XE);
>  		kmstest_set_vt_graphics_mode();
> @@ -621,18 +620,13 @@ igt_main
>  		igt_display_require_output(&data.display);
>  		for_each_pipe(&data.display, data.pipe)
>  			data.n_pipes++;
> -		dir = igt_sysfs_drm_module_params_open();
> -		if (dir >= 0) {
> -			current_log_level = igt_drm_debug_level_get(dir);
> -			close(dir);
> -
> -			if (current_log_level > 10)
> -				igt_drm_debug_level_update(10);
> -		}
>  		/*
>  		 * Some environments may have environment
>  		 * variable set to ignore long hpd, disable it for this test
>  		 */
> +
> +		igt_drm_debug_severity_update(DRM_UT_KMS);
> +
>  		igt_assert_f(igt_ignore_long_hpd(data.drm_fd, false),
>  			     "Unable to disable ignore long hpd\n");
>  	}
> diff --git a/tests/kms_atomic_transition.c b/tests/kms_atomic_transition.c
> index 0342af206..6c5bfa188 100644
> --- a/tests/kms_atomic_transition.c
> +++ b/tests/kms_atomic_transition.c
> @@ -1171,8 +1171,6 @@ igt_main_args("", long_opts, help_str, opt_handler, &data)
>  	int pipe_count = 0;
>  
>  	igt_fixture {
> -		int dir, current_log_level;
> -
>  		data.drm_fd = drm_open_driver_master(DRIVER_ANY);
>  
>  		kmstest_set_vt_graphics_mode();
> @@ -1185,14 +1183,7 @@ igt_main_args("", long_opts, help_str, opt_handler, &data)
>  		for_each_connected_output(&data.display, output)
>  			count++;
>  
> -		dir = igt_sysfs_drm_module_params_open();
> -		if (dir >= 0) {
> -			current_log_level = igt_drm_debug_level_get(dir);
> -			close(dir);
> -
> -			if (current_log_level > 10)
> -				igt_drm_debug_level_update(10);
> -		}
> +		igt_drm_debug_severity_update(DRM_UT_KMS);
>  	}
>  
>  	igt_describe("Check toggling of primary plane with vblank");
> diff --git a/tests/kms_cursor_legacy.c b/tests/kms_cursor_legacy.c
> index 44f031e7b..e317fbf30 100644
> --- a/tests/kms_cursor_legacy.c
> +++ b/tests/kms_cursor_legacy.c
> @@ -1839,7 +1839,6 @@ igt_main
>  	};
>  
>  	igt_fixture {
> -		int dir, current_log_level;
>  		display.drm_fd = drm_open_driver_master(DRIVER_ANY);
>  		kmstest_set_vt_graphics_mode();
>  
> @@ -1851,14 +1850,7 @@ igt_main
>  		 */
>  		intel_psr2_restore = i915_psr2_sel_fetch_to_psr1(display.drm_fd, NULL);
>  
> -		dir = igt_sysfs_drm_module_params_open();
> -		if (dir >= 0) {
> -			current_log_level = igt_drm_debug_level_get(dir);
> -			close(dir);
> -
> -			if (current_log_level > 10)
> -				igt_drm_debug_level_update(10);
> -		}
> +		igt_drm_debug_severity_update(DRM_UT_KMS);
>  	}
>  
>  	igt_describe("Test checks how many cursor updates we can fit between vblanks "

-- 
Jani Nikula, Intel