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

Commit e271e872 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'fix/hda' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 

* 'fix/hda' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
  ALSA: hda - Add a PC-beep workaround for ASUS P5-V
  ALSA: hda - Assume PC-beep as default for Realtek
  ALSA: hda - Don't register beep input device when no beep is available
  ALSA: hda - Fix pin-detection of Nvidia HDMI
parents 8f92054e dc1eae25

sound/pci/hda/patch_hdmi.c

+13 −0
Original line number Diff line number Diff line
@@ -52,6 +52,10 @@ struct hdmi_spec { 
	 */

	struct hda_multi_out multiout;

	unsigned int codec_type;



	/* misc flags */

	/* PD bit indicates only the update, not the current state */

	unsigned int old_pin_detect:1;

};
@@ -616,6 +620,9 @@ static void hdmi_setup_audio_infoframe(struct hda_codec *codec, hda_nid_t nid, 
 * Unsolicited events

 */



static void hdmi_present_sense(struct hda_codec *codec, hda_nid_t pin_nid,

			       struct hdmi_eld *eld);



static void hdmi_intrinsic_event(struct hda_codec *codec, unsigned int res)

{

	struct hdmi_spec *spec = codec->spec;
@@ -632,6 +639,12 @@ static void hdmi_intrinsic_event(struct hda_codec *codec, unsigned int res) 
	if (index < 0)

		return;



	if (spec->old_pin_detect) {

		if (pind)

			hdmi_present_sense(codec, tag, &spec->sink_eld[index]);

		pind = spec->sink_eld[index].monitor_present;

	}



	spec->sink_eld[index].monitor_present = pind;

	spec->sink_eld[index].eld_valid = eldv;

sound/pci/hda/patch_nvhdmi.c

+3 −0
Original line number Diff line number Diff line
@@ -478,6 +478,7 @@ static int patch_nvhdmi_8ch_89(struct hda_codec *codec) 


	codec->spec = spec;

	spec->codec_type = HDA_CODEC_NVIDIA_MCP89;

	spec->old_pin_detect = 1;



	if (hdmi_parse_codec(codec) < 0) {

		codec->spec = NULL;
@@ -508,6 +509,7 @@ static int patch_nvhdmi_8ch_7x(struct hda_codec *codec) 
	spec->multiout.max_channels = 8;

	spec->multiout.dig_out_nid = nvhdmi_master_con_nid_7x;

	spec->codec_type = HDA_CODEC_NVIDIA_MCP7X;

	spec->old_pin_detect = 1;



	codec->patch_ops = nvhdmi_patch_ops_8ch_7x;
@@ -528,6 +530,7 @@ static int patch_nvhdmi_2ch(struct hda_codec *codec) 
	spec->multiout.max_channels = 2;

	spec->multiout.dig_out_nid = nvhdmi_master_con_nid_7x;

	spec->codec_type = HDA_CODEC_NVIDIA_MCP7X;

	spec->old_pin_detect = 1;



	codec->patch_ops = nvhdmi_patch_ops_2ch;

sound/pci/hda/patch_realtek.c

+42 −20
Original line number Diff line number Diff line
@@ -1267,11 +1267,11 @@ static int alc_auto_parse_customize_define(struct hda_codec *codec) 
	unsigned nid = 0;

	struct alc_spec *spec = codec->spec;













	ass = codec->subsystem_id & 0xffff;













	if (ass != codec->bus->pci->subsystem_device && (ass & 1)) {















	spec->cdefine.enable_pcbeep = 1; /* assume always enabled */

























	ass = codec->subsystem_id & 0xffff;













	if (ass != codec->bus->pci->subsystem_device && (ass & 1))















		goto do_sku;













	}





























	nid = 0x1d;















	if (codec->vendor_id == 0x10ec0260)










@@ -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,11 +10582,13 @@ static int patch_alc882(struct hda_codec *codec)













		}















	}



























	if (has_cdefine_beep(codec)) {















		err = snd_hda_attach_beep_device(codec, 0x1);















		if (err < 0) {















			alc_free(codec);















			return err;















		}













	}





























	if (board_config != ALC882_AUTO)















		setup_preset(codec, &alc882_presets[board_config]);










@@ -10619,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)










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













		}















	}



























	if (!spec->no_analog) {













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















		err = snd_hda_attach_beep_device(codec, 0x1);















		if (err < 0) {















			alc_free(codec);










@@ -12486,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;










@@ -14458,11 +14476,13 @@ static int patch_alc269(struct hda_codec *codec)













		}















	}



























	if (has_cdefine_beep(codec)) {















		err = snd_hda_attach_beep_device(codec, 0x1);















		if (err < 0) {















			alc_free(codec);















			return err;















		}













	}





























	if (board_config != ALC269_AUTO)















		setup_preset(codec, &alc269_presets[board_config]);










@@ -14494,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)










@@ -18691,11 +18711,13 @@ static int patch_alc662(struct hda_codec *codec)













		}















	}



























	if (has_cdefine_beep(codec)) {















		err = snd_hda_attach_beep_device(codec, 0x1);















		if (err < 0) {















			alc_free(codec);















			return err;















		}













	}





























	if (board_config != ALC662_AUTO)















		setup_preset(codec, &alc662_presets[board_config]);









@@ -18716,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);