[PATCH i-g-t 8/9] i915_module_load: Stop caring about snd

[Matt Roper]

On Mon, Nov 04, 2024 at 10:18:44PM -0800, Lucas De Marchi wrote:
> Just handle i915 and it should work.
> 
> Signed-off-by: Lucas De Marchi <lucas.demarchi at intel.com>
> ---
>  tests/intel/i915_module_load.c | 32 --------------------------------
>  1 file changed, 32 deletions(-)
> 
> diff --git a/tests/intel/i915_module_load.c b/tests/intel/i915_module_load.c
> index b3752a19c..c78b843f9 100644
> --- a/tests/intel/i915_module_load.c
> +++ b/tests/intel/i915_module_load.c
> @@ -271,41 +271,12 @@ static void gem_sanitycheck(void)
>  	igt_assert_eq(err, expected);
>  }
>  
> -static void
> -hda_dynamic_debug(bool enable)
> -{
> -	FILE *fp;
> -	const char snd_hda_intel_on[] = "module snd_hda_intel +pf";
> -	const char snd_hda_core_on[] = "module snd_hda_core +pf";
> -
> -	const char snd_hda_intel_off[] = "module snd_hda_core =_";
> -	const char snd_hda_core_off[] = "module snd_hda_intel =_";
> -
> -	fp = fopen("/sys/kernel/debug/dynamic_debug/control", "w");
> -	if (!fp) {
> -		igt_debug("hda dynamic debug not available\n");
> -		return;
> -	}
> -
> -	if (enable) {
> -		fwrite(snd_hda_intel_on, 1, sizeof(snd_hda_intel_on), fp);
> -		fwrite(snd_hda_core_on, 1, sizeof(snd_hda_core_on), fp);
> -	} else {
> -		fwrite(snd_hda_intel_off, 1, sizeof(snd_hda_intel_off), fp);
> -		fwrite(snd_hda_core_off, 1, sizeof(snd_hda_core_off), fp);
> -	}
> -
> -	fclose(fp);
> -}
> -
>  static void load_and_check_i915(void)
>  {
>  	int error;
>  	int drm_fd;
>  
> -	hda_dynamic_debug(true);
>  	error = igt_i915_driver_load(NULL);
> -	hda_dynamic_debug(false);
>  
>  	igt_assert_eq(error, 0);
>  
> @@ -367,9 +338,6 @@ igt_main
>  	igt_subtest("load") {
>  		const char * unwanted_drivers[] = {
>  			"i915",
> -			"intel-gtt",

The intel-gtt AGP driver isn't snd-related.  You should probably either
mention it specifically in the commit message or put it in a separate
patch.

I believe it should still be fine to drop it and just unbind+unload
i915, so

        Reviewed-by: Matt Roper <matthew.d.roper at intel.com>

with that mentioned.


Matt

> -			"snd_hda_intel",
> -			"snd_hdmi_lpe_audio",
>  			NULL
>  		};
>  
> -- 
> 2.47.0
> 

-- 
Matt Roper
Graphics Software Engineer
Linux GPU Platform Enablement
Intel Corporation