Skip to contentSkip to conversation

sound fix for 2.6.35

GIT PULL Takashi Iwai 1 participant 1 message Jul 29, 2010 Sound

lore
Share & tools
lore
#0 lore raw

Linus,

please pull sound fixes for v2.6.35 from:

git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git fix/hda

containing the following fixes for HD-audio. All are fairly device-specific, espeically about PC-beep regression on Realtek codecs.

This should be the last pull request for 2.6.35 regarding sound (hopefully).

Thanks!

Takashi

===

Takashi Iwai (4):
ALSA: hda - Fix pin-detection of Nvidia HDMI
ALSA: hda - Don't register beep input device when no beep is available
ALSA: hda - Assume PC-beep as default for Realtek
ALSA: hda - Add a PC-beep workaround for ASUS P5-V

---
 sound/pci/hda/patch_hdmi.c    |   13 ++++++++
 sound/pci/hda/patch_nvhdmi.c  |    3 ++
 sound/pci/hda/patch_realtek.c |   62 +++++++++++++++++++++++++++-------------
 3 files changed, 58 insertions(+), 20 deletions(-)
sound/pci/hda/patch_hdmi.c +13 -0
index 86067ee7..2fc5396 100644
@@ -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
index 3c10c0b..b0652ac 100644
@@ -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

126 lines not on this page · raw message