tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'sound-4.1-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

Pull sound fixes from Takashi Iwai:
"No big surprise here, just a bunch of small fixes for HD-audio and
USB-audio:

- partial revert of widget power-saving for IDT codecs
- revert mute-LED enum ctl for Thinkpads due to confusion
- a quirk for a new Radeon HDMI controller
- Realtek codec name fix for Dell
- a workaround for headphone mic boost on some laptops
- stream_pm ops setup (and its fix for regression)
- another quirk for MS LifeCam USB-audio"

* tag 'sound-4.1-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
ALSA: hda - Fix lost sound due to stream_pm ops cleanup
ALSA: hda - Disable Headphone Mic boost for ALC662
ALSA: hda - Disable power_save_node for IDT92HD71bxx
ALSA: hda - Fix noise on AMD radeon 290x controller
ALSA: hda - Set stream_pm ops automatically by generic parser
ALSA: hda/realtek - Add ALC256 alias name for Dell
Revert "ALSA: hda - Add mute-LED mode control to Thinkpad"
ALSA: usb-audio: Add quirk for MS LifeCam HD-3000

Linus Torvalds 70946b5d c492e2d4

+15 -4
+4 -1
sound/pci/hda/hda_generic.c
··· 4926 4926 dig_only: 4927 4927 parse_digital(codec); 4928 4928 4929 - if (spec->power_down_unused || codec->power_save_node) 4929 + if (spec->power_down_unused || codec->power_save_node) { 4930 4930 if (!codec->power_filter) 4931 4931 codec->power_filter = snd_hda_gen_path_power_filter; 4932 + if (!codec->patch_ops.stream_pm) 4933 + codec->patch_ops.stream_pm = snd_hda_gen_stream_pm; 4934 + } 4932 4935 4933 4936 if (!spec->no_analog && spec->beep_nid) { 4934 4937 err = snd_hda_attach_beep_device(codec, spec->beep_nid);
+2
sound/pci/hda/hda_intel.c
··· 2089 2089 .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS }, 2090 2090 { PCI_DEVICE(0x1002, 0xaab0), 2091 2091 .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS }, 2092 + { PCI_DEVICE(0x1002, 0xaac8), 2093 + .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS }, 2092 2094 /* VIA VT8251/VT8237A */ 2093 2095 { PCI_DEVICE(0x1106, 0x3288), 2094 2096 .driver_data = AZX_DRIVER_VIA | AZX_DCAPS_POSFIX_VIA },
+6
sound/pci/hda/patch_realtek.c
··· 884 884 { 0x10ec0275, 0x1028, 0, "ALC3260" }, 885 885 { 0x10ec0899, 0x1028, 0, "ALC3861" }, 886 886 { 0x10ec0298, 0x1028, 0, "ALC3266" }, 887 + { 0x10ec0256, 0x1028, 0, "ALC3246" }, 887 888 { 0x10ec0670, 0x1025, 0, "ALC669X" }, 888 889 { 0x10ec0676, 0x1025, 0, "ALC679X" }, 889 890 { 0x10ec0282, 0x1043, 0, "ALC3229" }, ··· 4228 4227 if (action == HDA_FIXUP_ACT_PRE_PROBE) { 4229 4228 spec->parse_flags |= HDA_PINCFG_HEADSET_MIC; 4230 4229 spec->gen.hp_mic = 1; /* Mic-in is same pin as headphone */ 4230 + 4231 + /* Disable boost for mic-in permanently. (This code is only called 4232 + from quirks that guarantee that the headphone is at NID 0x1b.) */ 4233 + snd_hda_codec_write(codec, 0x1b, 0, AC_VERB_SET_AMP_GAIN_MUTE, 0x7000); 4234 + snd_hda_override_wcaps(codec, 0x1b, get_wcaps(codec, 0x1b) & ~AC_WCAP_IN_AMP); 4231 4235 } else 4232 4236 alc_fixup_headset_mode(codec, fix, action); 4233 4237 }
+2 -2
sound/pci/hda/patch_sigmatel.c
··· 4403 4403 #ifdef CONFIG_PM 4404 4404 .suspend = stac_suspend, 4405 4405 #endif 4406 - .stream_pm = snd_hda_gen_stream_pm, 4407 4406 .reboot_notify = stac_shutup, 4408 4407 }; 4409 4408 ··· 4696 4697 return err; 4697 4698 4698 4699 spec = codec->spec; 4699 - codec->power_save_node = 1; 4700 + /* disabled power_save_node since it causes noises on a Dell machine */ 4701 + /* codec->power_save_node = 1; */ 4700 4702 spec->linear_tone_beep = 0; 4701 4703 spec->gen.own_eapd_ctl = 1; 4702 4704 spec->gen.power_down_unused = 1;
-1
sound/pci/hda/thinkpad_helper.c
··· 72 72 if (led_set_func(TPACPI_LED_MUTE, false) >= 0) { 73 73 old_vmaster_hook = spec->vmaster_mute.hook; 74 74 spec->vmaster_mute.hook = update_tpacpi_mute_led; 75 - spec->vmaster_mute_enum = 1; 76 75 removefunc = false; 77 76 } 78 77 if (led_set_func(TPACPI_LED_MICMUTE, false) >= 0) {
+1
sound/usb/quirks.c
··· 1118 1118 case USB_ID(0x045E, 0x075D): /* MS Lifecam Cinema */ 1119 1119 case USB_ID(0x045E, 0x076D): /* MS Lifecam HD-5000 */ 1120 1120 case USB_ID(0x045E, 0x0772): /* MS Lifecam Studio */ 1121 + case USB_ID(0x045E, 0x0779): /* MS Lifecam HD-3000 */ 1121 1122 case USB_ID(0x04D8, 0xFEEA): /* Benchmark DAC1 Pre */ 1122 1123 return true; 1123 1124 }