sound fixes for 4.12-rc1
Linus,
please pull sound fixes for v4.12-rc1 from:
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git tags/sound-fix-4.12-rc1
The topmost commit is 31cbee6a5611f07d2d66f55bb6f8648db5947e32
----------------------------------------------------------------
sound fixes for 4.12-rc1
This contains a one-liner change that has a significant impact:
disabling the build of OSS. It's been unmaintained for long time, and we'd like to drop the stuff. Finally, as the first step, stop the build. Let's see whether it works without much complaints.
Other than that, there are two small fixes for HD-audio.
----------------------------------------------------------------
Florin Tudorache (1):
ALSA: hda - Add mute led support for HP EliteBook 840 G3
Jeeja KP (1):
ALSA: hda: Fix cpu lockup when stopping the cmd dmas
Takashi Iwai (1):
sound: Disable the build of OSS drivers
--- sound/Kconfig | 1 + sound/hda/hdac_controller.c | 4 ++++ sound/pci/hda/patch_conexant.c | 4 +++- 3 files changed, 8 insertions(+), 1 deletion(-)
sound/Kconfig +1 -0
@@ -115,6 +115,7 @@ endif # SND menuconfig SOUND_PRIME tristate "Open Sound System (DEPRECATED)" select SOUND_OSS_CORE + depends on BROKEN help Say 'Y' or 'M' to enable Open Sound System drivers.
sound/hda/hdac_controller.c +4 -0
@@ -106,7 +106,11 @@ void snd_hdac_bus_stop_cmd_io(struct hdac_bus *bus)/* disable ringbuffer DMAs */ snd_hdac_chip_writeb (bus,RIRBCTL ,0 );snd_hdac_chip_writeb (bus,CORBCTL ,0 ); +spin_unlock_irq (&bus->reg_lock); +hdac_wait_for_cmd_dmas (bus); + +spin_lock_irq (&bus->reg_lock);/* disable unsolicited responses */ snd_hdac_chip_updatel (bus,GCTL ,AZX_GCTL_UNSOL ,0 );spin_unlock_irq (&bus->reg_lock);
sound/pci/hda/patch_conexant.c +3 -1
@@ -860,7 +860,9 @@ static const struct hda_fixup cxt_fixups[] = { { 0x16, 0x21011020 }, /* line-out */ { 0x18, 0x2181103f }, /* line-in */ { } - } + }, + .chained = true, + .chain_id = CXT_FIXUP_MUTE_LED_GPIO, }, [CXT_FIXUP_HP_SPECTRE] = { .type = HDA_FIXUP_PINS,