Browse Source

[ALSA] hda-codec - Add afg and mfg preset mask

Added afg and mfg preset masks for more finer codec-preset selection.

Signed-off-by: Marc Boucher <marc@linuxant.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Marc Boucher 17 năm trước cách đây
mục cha
commit
ca7cfae9eb
2 tập tin đã thay đổi với 5 bổ sung0 xóa
  1. 4 0
      sound/pci/hda/hda_codec.c
  2. 1 0
      sound/pci/hda/hda_codec.h

+ 4 - 0
sound/pci/hda/hda_codec.c

@@ -429,6 +429,10 @@ find_codec_preset(struct hda_codec *codec)
 	for (tbl = hda_preset_tables; *tbl; tbl++) {
 		for (preset = *tbl; preset->id; preset++) {
 			u32 mask = preset->mask;
+			if (preset->afg && preset->afg != codec->afg)
+				continue;
+			if (preset->mfg && preset->mfg != codec->mfg)
+				continue;
 			if (!mask)
 				mask = ~0;
 			if (preset->id == (codec->vendor_id & mask) &&

+ 1 - 0
sound/pci/hda/hda_codec.h

@@ -523,6 +523,7 @@ struct hda_codec_preset {
 	unsigned int subs;
 	unsigned int subs_mask;
 	unsigned int rev;
+	hda_nid_t afg, mfg;
 	const char *name;
 	int (*patch)(struct hda_codec *codec);
 };