Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dc1eae25 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: hda - Add a PC-beep workaround for ASUS P5-V 



ASUS P5-V provides a SSID that unexpectedly matches with the value
compilant with Realtek's specification.  Thus the driver interprets
it badly, resulting in non-working PC beep.

This patch adds a white-list for such a case; a white-list of known
devices with working PC beep.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent b6cbe517

sound/pci/hda/patch_realtek.c

+24 −8
Original line number Diff line number Diff line
@@ -5180,8 +5180,24 @@ static void fillup_priv_adc_nids(struct hda_codec *codec, hda_nid_t *nids, 
#ifdef CONFIG_SND_HDA_INPUT_BEEP

#define set_beep_amp(spec, nid, idx, dir) \

	((spec)->beep_amp = HDA_COMPOSE_AMP_VAL(nid, 3, idx, dir))













static struct snd_pci_quirk beep_white_list[] = {













	SND_PCI_QUIRK(0x1043, 0x829f, "ASUS", 1),













	{}













};

























static inline int has_cdefine_beep(struct hda_codec *codec)













{













	struct alc_spec *spec = codec->spec;













	const struct snd_pci_quirk *q;













	q = snd_pci_quirk_lookup(codec->bus->pci, beep_white_list);













	if (q)













		return q->value;













	return spec->cdefine.enable_pcbeep;













}















#else















#define set_beep_amp(spec, nid, idx, dir) /* NOP */













#define has_cdefine_beep(codec)		0















#endif





























/*










@@ -10566,7 +10582,7 @@ static int patch_alc882(struct hda_codec *codec)













		}















	}



























	if (spec->cdefine.enable_pcbeep) {













	if (has_cdefine_beep(codec)) {















		err = snd_hda_attach_beep_device(codec, 0x1);















		if (err < 0) {















			alc_free(codec);










@@ -10621,7 +10637,7 @@ static int patch_alc882(struct hda_codec *codec)



























	set_capture_mixer(codec);



























	if (spec->cdefine.enable_pcbeep)













	if (has_cdefine_beep(codec))















		set_beep_amp(spec, 0x0b, 0x05, HDA_INPUT);





























	if (board_config == ALC882_AUTO)










@@ -12437,7 +12453,7 @@ static int patch_alc262(struct hda_codec *codec)













		}















	}



























	if (!spec->no_analog && spec->cdefine.enable_pcbeep) {













	if (!spec->no_analog && has_cdefine_beep(codec)) {















		err = snd_hda_attach_beep_device(codec, 0x1);















		if (err < 0) {















			alc_free(codec);










@@ -12488,7 +12504,7 @@ static int patch_alc262(struct hda_codec *codec)













	}















	if (!spec->cap_mixer && !spec->no_analog)















		set_capture_mixer(codec);













	if (!spec->no_analog && spec->cdefine.enable_pcbeep)













	if (!spec->no_analog && has_cdefine_beep(codec))















		set_beep_amp(spec, 0x0b, 0x05, HDA_INPUT);





























	spec->vmaster_nid = 0x0c;










@@ -14460,7 +14476,7 @@ static int patch_alc269(struct hda_codec *codec)













		}















	}



























	if (spec->cdefine.enable_pcbeep) {













	if (has_cdefine_beep(codec)) {















		err = snd_hda_attach_beep_device(codec, 0x1);















		if (err < 0) {















			alc_free(codec);










@@ -14498,7 +14514,7 @@ static int patch_alc269(struct hda_codec *codec)



























	if (!spec->cap_mixer)















		set_capture_mixer(codec);













	if (spec->cdefine.enable_pcbeep)













	if (has_cdefine_beep(codec))















		set_beep_amp(spec, 0x0b, 0x04, HDA_INPUT);





























	if (board_config == ALC269_AUTO)










@@ -18695,7 +18711,7 @@ static int patch_alc662(struct hda_codec *codec)













		}















	}



























	if (spec->cdefine.enable_pcbeep) {













	if (has_cdefine_beep(codec)) {















		err = snd_hda_attach_beep_device(codec, 0x1);















		if (err < 0) {















			alc_free(codec);









@@ -18722,7 +18738,7 @@ static int patch_alc662(struct hda_codec *codec)













	if (!spec->cap_mixer)















		set_capture_mixer(codec);



























	if (spec->cdefine.enable_pcbeep) {













	if (has_cdefine_beep(codec)) {















		switch (codec->vendor_id) {















		case 0x10ec0662:















			set_beep_amp(spec, 0x0b, 0x05, HDA_INPUT);