From: Greg Kroah-Hartman Date: Tue, 31 Dec 2013 05:34:30 +0000 (-0800) Subject: 3.12-stable patches X-Git-Tag: v3.4.76~68 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ab3037f7f8102c443c0f24203604f464eea128ff;p=thirdparty%2Fkernel%2Fstable-queue.git 3.12-stable patches added patches: alsa-hda-add-enable_msi-0-workaround-for-four-hp-machines.patch --- diff --git a/queue-3.12/alsa-hda-add-enable_msi-0-workaround-for-four-hp-machines.patch b/queue-3.12/alsa-hda-add-enable_msi-0-workaround-for-four-hp-machines.patch new file mode 100644 index 00000000000..ac627e7e9e6 --- /dev/null +++ b/queue-3.12/alsa-hda-add-enable_msi-0-workaround-for-four-hp-machines.patch @@ -0,0 +1,40 @@ +From 693e0cb052c607e2d41edf9e9f1fa99ff8c266c1 Mon Sep 17 00:00:00 2001 +From: David Henningsson +Date: Thu, 12 Dec 2013 09:52:03 +0100 +Subject: ALSA: hda - Add enable_msi=0 workaround for four HP machines + +From: David Henningsson + +commit 693e0cb052c607e2d41edf9e9f1fa99ff8c266c1 upstream. + +While enabling these machines, we found we would sometimes lose an +interrupt if we change hardware volume during playback, and that +disabling msi fixed this issue. (Losing the interrupt caused underruns +and crackling audio, as the one second timeout is usually bigger than +the period size.) + +The machines were all machines from HP, running AMD Hudson controller, +and Realtek ALC282 codec. + +BugLink: https://bugs.launchpad.net/bugs/1260225 +Signed-off-by: David Henningsson +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman + +--- + sound/pci/hda/hda_intel.c | 4 ++++ + 1 file changed, 4 insertions(+) + +--- a/sound/pci/hda/hda_intel.c ++++ b/sound/pci/hda/hda_intel.c +@@ -3430,6 +3430,10 @@ static void check_probe_mask(struct azx + * white/black-list for enable_msi + */ + static struct snd_pci_quirk msi_black_list[] = { ++ SND_PCI_QUIRK(0x103c, 0x2191, "HP", 0), /* AMD Hudson */ ++ SND_PCI_QUIRK(0x103c, 0x2192, "HP", 0), /* AMD Hudson */ ++ SND_PCI_QUIRK(0x103c, 0x21f7, "HP", 0), /* AMD Hudson */ ++ SND_PCI_QUIRK(0x103c, 0x21fa, "HP", 0), /* AMD Hudson */ + SND_PCI_QUIRK(0x1043, 0x81f2, "ASUS", 0), /* Athlon64 X2 + nvidia */ + SND_PCI_QUIRK(0x1043, 0x81f6, "ASUS", 0), /* nvidia */ + SND_PCI_QUIRK(0x1043, 0x822d, "ASUS", 0), /* Athlon64 X2 + nvidia MCP55 */ diff --git a/queue-3.12/series b/queue-3.12/series index 02dfd413d74..b87c20183da 100644 --- a/queue-3.12/series +++ b/queue-3.12/series @@ -15,3 +15,4 @@ asoc-wm8904-fix-dsp-mode-b-configuration.patch asoc-wm_adsp-add-small-delay-while-polling-dsp-ram-start.patch asoc-wm5110-correct-hpout3-dapm-route-typo.patch alsa-add-sndrv_pcm_state_paused-case-in-wait_for_avail-function.patch +alsa-hda-add-enable_msi-0-workaround-for-four-hp-machines.patch