Эх сурвалжийг харах

[ALSA] hda-codec - Allow model=generic always for generic parser

Accept model=generic option to specify the generic parser regardless
of codec chips.  This is helpful for testing and debugging.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Takashi Iwai 18 жил өмнө
parent
commit
6d7b1d7d09

+ 4 - 0
Documentation/sound/alsa/ALSA-Configuration.txt

@@ -924,6 +924,10 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
 	  vaio		Setup for VAIO FE550G/SZ110
 	  vaio-ar Setup for VAIO AR
 
+    The model name "genric" is treated as a special case.  When this
+    model is given, the driver uses the generic codec parser without
+    "codec-patch".  It's sometimes good for testing and debugging.
+
     If the default configuration doesn't work and one of the above
     matches with your device, report it together with the PCI
     subsystem ID (output of "lspci -nv") to ALSA BTS or alsa-devel

+ 2 - 1
sound/pci/hda/hda_codec.c

@@ -573,7 +573,8 @@ int snd_hda_codec_new(struct hda_bus *bus, unsigned int codec_addr,
 							 0);
 	}
 
-	codec->preset = find_codec_preset(codec);
+	if (strcmp(codec->bus->modelname, "generic"))
+		codec->preset = find_codec_preset(codec);
 	if (! *bus->card->mixername)
 		snd_hda_get_codec_name(codec, bus->card->mixername,
 				       sizeof(bus->card->mixername));