From: Greg Kroah-Hartman Date: Thu, 12 Mar 2015 10:42:21 +0000 (+0100) Subject: 3.14-stable patches X-Git-Tag: v3.10.72~24 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4aa420aab988e61585c89f40908f2319c351ad4f;p=thirdparty%2Fkernel%2Fstable-queue.git 3.14-stable patches added patches: alsa-hda-add-pin-configs-for-asus-mobo-with-idt-92hd73xx-codec.patch alsa-hda-disable-runtime-pm-for-panther-point-again.patch alsa-pcm-don-t-leave-prepared-state-after-draining.patch --- diff --git a/queue-3.14/alsa-hda-add-pin-configs-for-asus-mobo-with-idt-92hd73xx-codec.patch b/queue-3.14/alsa-hda-add-pin-configs-for-asus-mobo-with-idt-92hd73xx-codec.patch new file mode 100644 index 00000000000..ea6b50a5ed3 --- /dev/null +++ b/queue-3.14/alsa-hda-add-pin-configs-for-asus-mobo-with-idt-92hd73xx-codec.patch @@ -0,0 +1,67 @@ +From 6426460e5d87810e042962281fe3c1e8fc256162 Mon Sep 17 00:00:00 2001 +From: Takashi Iwai +Date: Thu, 19 Feb 2015 13:01:37 +0100 +Subject: ALSA: hda - Add pin configs for ASUS mobo with IDT 92HD73XX codec + +From: Takashi Iwai + +commit 6426460e5d87810e042962281fe3c1e8fc256162 upstream. + +BIOS doesn't seem to set up pins for 5.1 and the SPDIF out, so we need +to give explicitly here. + +Reported-and-tested-by: Misan Thropos +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman + +--- + sound/pci/hda/patch_sigmatel.c | 17 ++++++++++++++++- + 1 file changed, 16 insertions(+), 1 deletion(-) + +--- a/sound/pci/hda/patch_sigmatel.c ++++ b/sound/pci/hda/patch_sigmatel.c +@@ -85,6 +85,7 @@ enum { + STAC_ALIENWARE_M17X, + STAC_92HD89XX_HP_FRONT_JACK, + STAC_92HD89XX_HP_Z1_G2_RIGHT_MIC_JACK, ++ STAC_92HD73XX_ASUS_MOBO, + STAC_92HD73XX_MODELS + }; + +@@ -1935,7 +1936,18 @@ static const struct hda_fixup stac92hd73 + [STAC_92HD89XX_HP_Z1_G2_RIGHT_MIC_JACK] = { + .type = HDA_FIXUP_PINS, + .v.pins = stac92hd89xx_hp_z1_g2_right_mic_jack_pin_configs, +- } ++ }, ++ [STAC_92HD73XX_ASUS_MOBO] = { ++ .type = HDA_FIXUP_PINS, ++ .v.pins = (const struct hda_pintbl[]) { ++ /* enable 5.1 and SPDIF out */ ++ { 0x0c, 0x01014411 }, ++ { 0x0d, 0x01014410 }, ++ { 0x0e, 0x01014412 }, ++ { 0x22, 0x014b1180 }, ++ { } ++ } ++ }, + }; + + static const struct hda_model_fixup stac92hd73xx_models[] = { +@@ -1947,6 +1959,7 @@ static const struct hda_model_fixup stac + { .id = STAC_DELL_M6_BOTH, .name = "dell-m6" }, + { .id = STAC_DELL_EQ, .name = "dell-eq" }, + { .id = STAC_ALIENWARE_M17X, .name = "alienware" }, ++ { .id = STAC_92HD73XX_ASUS_MOBO, .name = "asus-mobo" }, + {} + }; + +@@ -1999,6 +2012,8 @@ static const struct snd_pci_quirk stac92 + "HP Z1 G2", STAC_92HD89XX_HP_Z1_G2_RIGHT_MIC_JACK), + SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x2b17, + "unknown HP", STAC_92HD89XX_HP_FRONT_JACK), ++ SND_PCI_QUIRK(PCI_VENDOR_ID_ASUSTEK, 0x83f8, "ASUS AT4NM10", ++ STAC_92HD73XX_ASUS_MOBO), + {} /* terminator */ + }; + diff --git a/queue-3.14/alsa-hda-disable-runtime-pm-for-panther-point-again.patch b/queue-3.14/alsa-hda-disable-runtime-pm-for-panther-point-again.patch new file mode 100644 index 00000000000..a0743bacfe4 --- /dev/null +++ b/queue-3.14/alsa-hda-disable-runtime-pm-for-panther-point-again.patch @@ -0,0 +1,33 @@ +From de5d0ad506cb10ab143e2ffb9def7607e3671f83 Mon Sep 17 00:00:00 2001 +From: Takashi Iwai +Date: Wed, 25 Feb 2015 07:53:31 +0100 +Subject: ALSA: hda - Disable runtime PM for Panther Point again + +From: Takashi Iwai + +commit de5d0ad506cb10ab143e2ffb9def7607e3671f83 upstream. + +This is essentially a partial revert of the commit [b1920c21102a: +'ALSA: hda - Enable runtime PM on Panther Point']. There was a bug +report showing the HD-audio bus hang during runtime PM on HP Spectre +XT. + +Reported-by: Dang Sananikone +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman + +--- + sound/pci/hda/hda_intel.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/sound/pci/hda/hda_intel.c ++++ b/sound/pci/hda/hda_intel.c +@@ -3984,7 +3984,7 @@ static DEFINE_PCI_DEVICE_TABLE(azx_ids) + .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH_NOPM }, + /* Panther Point */ + { PCI_DEVICE(0x8086, 0x1e20), +- .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH }, ++ .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH_NOPM }, + /* Lynx Point */ + { PCI_DEVICE(0x8086, 0x8c20), + .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH }, diff --git a/queue-3.14/alsa-pcm-don-t-leave-prepared-state-after-draining.patch b/queue-3.14/alsa-pcm-don-t-leave-prepared-state-after-draining.patch new file mode 100644 index 00000000000..12027a74d32 --- /dev/null +++ b/queue-3.14/alsa-pcm-don-t-leave-prepared-state-after-draining.patch @@ -0,0 +1,32 @@ +From 70372a7566b5e552dbe48abdac08c275081d8558 Mon Sep 17 00:00:00 2001 +From: Takashi Iwai +Date: Thu, 18 Dec 2014 10:02:41 +0100 +Subject: ALSA: pcm: Don't leave PREPARED state after draining + +From: Takashi Iwai + +commit 70372a7566b5e552dbe48abdac08c275081d8558 upstream. + +When a PCM draining is performed to an empty stream that has been +already in PREPARED state, the current code just ignores and leaves as +it is, although the drain is supposed to set all such streams to SETUP +state. This patch covers that overlooked case. + +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman + +--- + sound/core/pcm_native.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/sound/core/pcm_native.c ++++ b/sound/core/pcm_native.c +@@ -1404,6 +1404,8 @@ static int snd_pcm_do_drain_init(struct + if (! snd_pcm_playback_empty(substream)) { + snd_pcm_do_start(substream, SNDRV_PCM_STATE_DRAINING); + snd_pcm_post_start(substream, SNDRV_PCM_STATE_DRAINING); ++ } else { ++ runtime->status->state = SNDRV_PCM_STATE_SETUP; + } + break; + case SNDRV_PCM_STATE_RUNNING: diff --git a/queue-3.14/series b/queue-3.14/series index 3b93dbfe0af..87e76513df3 100644 --- a/queue-3.14/series +++ b/queue-3.14/series @@ -63,3 +63,6 @@ procfs-fix-race-between-symlink-removals-and-traversals.patch sunrpc-fix-braino-in-poll.patch arc-fix-kstk_esp.patch tty-fix-up-atime-mtime-mess-take-four.patch +alsa-pcm-don-t-leave-prepared-state-after-draining.patch +alsa-hda-add-pin-configs-for-asus-mobo-with-idt-92hd73xx-codec.patch +alsa-hda-disable-runtime-pm-for-panther-point-again.patch