This is a note to let you know that I've just added the patch titled
ALSA: hda - Force buffer alignment for Haswell HDMI controllers
to the 3.12-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
alsa-hda-force-buffer-alignment-for-haswell-hdmi-controllers.patch
and it can be found in the queue-3.12 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 33499a15c2f7addc81695778753c2338b960eff7 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@xxxxxxx>
Date: Tue, 5 Nov 2013 17:34:46 +0100
Subject: ALSA: hda - Force buffer alignment for Haswell HDMI controllers
From: Takashi Iwai <tiwai@xxxxxxx>
commit 33499a15c2f7addc81695778753c2338b960eff7 upstream.
Haswell HDMI audio controllers seem to get stuck when unaligned buffer
size is used. Let's enable the buffer alignment for the corresponding
entries.
Since AZX_DCAPS_INTEL_PCH contains AZX_DCAPS_BUFSIZE that disables the
buffer alignment forcibly, define AZX_DCAPS_INTEL_HASWELL and put the
necessary AZX_DCAPS bits there.
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=60769
Reported-by: Alexander E. Patrakov <patrakov@xxxxxxxxx>
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
sound/pci/hda/hda_intel.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -612,6 +612,11 @@ enum {
#define AZX_DCAPS_INTEL_PCH \
(AZX_DCAPS_INTEL_PCH_NOPM | AZX_DCAPS_PM_RUNTIME)
+#define AZX_DCAPS_INTEL_HASWELL \
+ (AZX_DCAPS_SCH_SNOOP | AZX_DCAPS_ALIGN_BUFSIZE | \
+ AZX_DCAPS_COUNT_LPIB_DELAY | AZX_DCAPS_PM_RUNTIME | \
+ AZX_DCAPS_I915_POWERWELL)
+
/* quirks for ATI SB / AMD Hudson */
#define AZX_DCAPS_PRESET_ATI_SB \
(AZX_DCAPS_ATI_SNOOP | AZX_DCAPS_NO_TCSEL | \
@@ -3987,14 +3992,11 @@ static DEFINE_PCI_DEVICE_TABLE(azx_ids)
.driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH },
/* Haswell */
{ PCI_DEVICE(0x8086, 0x0a0c),
- .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH |
- AZX_DCAPS_I915_POWERWELL },
+ .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_HASWELL },
{ PCI_DEVICE(0x8086, 0x0c0c),
- .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH |
- AZX_DCAPS_I915_POWERWELL },
+ .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_HASWELL },
{ PCI_DEVICE(0x8086, 0x0d0c),
- .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH |
- AZX_DCAPS_I915_POWERWELL },
+ .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_HASWELL },
/* 5 Series/3400 */
{ PCI_DEVICE(0x8086, 0x3b56),
.driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_NOPM },
Patches currently in stable-queue which might be from tiwai@xxxxxxx are
queue-3.12/alsa-hda-check-keep_eapd_on-before-inv_eapd.patch
queue-3.12/alsa-hda-don-t-clear-the-power-state-at-snd_hda_codec_reset.patch
queue-3.12/alsa-hda-add-support-for-cx20952.patch
queue-3.12/alsa-hda-enable-spdif-for-acer-travelmate-6293.patch
queue-3.12/alsa-hda-fix-the-headphone-jack-detection-on-sony-vaio-tx.patch
queue-3.12/alsa-hda-provide-missing-pin-configs-for-vaio-with-alc260.patch
queue-3.12/alsa-compress-fix-drain-calls-blocking-other-compress-functions.patch
queue-3.12/alsa-hda-introduce-the-bitmask-for-excluding-output-volume.patch
queue-3.12/alsa-hda-apply-gpio-setup-for-macbooks-with-cs4208.patch
queue-3.12/thinkpad_acpi-fix-build-error-when-config_snd_max_cards-32.patch
queue-3.12/alsa-hda-force-buffer-alignment-for-haswell-hdmi-controllers.patch
queue-3.12/alsa-hda-apply-macbook-fixups-for-cs4208-correctly.patch
queue-3.12/alsa-compress-fix-drain-calls-blocking-other-compress-functions-v6.patch
queue-3.12/alsa-hda-add-pincfg-fixup-for-asus-w5a.patch
queue-3.12/alsa-hda-add-support-of-alc255-codecs.patch
queue-3.12/alsa-6fire-fix-probe-of-multiple-cards.patch
queue-3.12/alsa-hda-make-sure-mute-leds-stay-on-during-runtime-suspend-realtek.patch
queue-3.12/alsa-msnd-avoid-duplicated-driver-name.patch
queue-3.12/alsa-hda-fix-line-out-automute-on-realtek-multifunction-jacks.patch
queue-3.12/alsa-pcsp-fix-the-order-of-input-device-unregistration.patch
queue-3.12/alsa-hda-add-headset-quirk-for-dell-inspiron-3135.patch
queue-3.12/alsa-hda-don-t-turn-off-eapd-for-headphone-on-lenovo-n100.patch
queue-3.12/alsa-hda-fix-unbalanced-runtime-pm-notification-at-resume.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html