]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
3.15-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 24 Jun 2014 14:24:06 +0000 (10:24 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 24 Jun 2014 14:24:06 +0000 (10:24 -0400)
added patches:
alsa-compress-cancel-the-optimization-of-compiler-and-fix.patch
alsa-hda-add-quirk-for-external-mic-on-lifebook-u904.patch
alsa-hda-realtek-add-more-entry-for-enable-hp-mute-led.patch
alsa-hda-realtek-add-support-of-alc891-codec.patch
alsa-hda-verify-pin-converter-connection-on-unsol-event-for-hsw-and-vlv.patch

queue-3.15/alsa-compress-cancel-the-optimization-of-compiler-and-fix.patch [new file with mode: 0644]
queue-3.15/alsa-hda-add-quirk-for-external-mic-on-lifebook-u904.patch [new file with mode: 0644]
queue-3.15/alsa-hda-realtek-add-more-entry-for-enable-hp-mute-led.patch [new file with mode: 0644]
queue-3.15/alsa-hda-realtek-add-support-of-alc891-codec.patch [new file with mode: 0644]
queue-3.15/alsa-hda-verify-pin-converter-connection-on-unsol-event-for-hsw-and-vlv.patch [new file with mode: 0644]
queue-3.15/series

diff --git a/queue-3.15/alsa-compress-cancel-the-optimization-of-compiler-and-fix.patch b/queue-3.15/alsa-compress-cancel-the-optimization-of-compiler-and-fix.patch
new file mode 100644 (file)
index 0000000..47ae148
--- /dev/null
@@ -0,0 +1,37 @@
+From 2bd0ae464a6cf7363bbf72c8545e0aa43caa57f0 Mon Sep 17 00:00:00 2001
+From: "Wang, Xiaoming" <xiaoming.wang@intel.com>
+Date: Thu, 12 Jun 2014 18:47:07 -0400
+Subject: ALSA: compress: Cancel the optimization of compiler and fix
+ the size of struct for all platform.
+
+From: "Wang, Xiaoming" <xiaoming.wang@intel.com>
+
+commit 2bd0ae464a6cf7363bbf72c8545e0aa43caa57f0 upstream.
+
+Cancel the optimization of compiler for struct snd_compr_avail
+which size will be 0x1c in 32bit kernel while 0x20 in 64bit
+kernel under the optimizer. That will make compaction between
+32bit and 64bit. So add packed to fix the size of struct
+snd_compr_avail to 0x1c for all platform.
+
+Signed-off-by: Zhang Dongxing <dongxing.zhang@intel.com>
+Signed-off-by: xiaoming wang <xiaoming.wang@intel.com>
+Acked-by: Vinod Koul <vinod.koul@intel.com>
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ include/uapi/sound/compress_offload.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/include/uapi/sound/compress_offload.h
++++ b/include/uapi/sound/compress_offload.h
+@@ -80,7 +80,7 @@ struct snd_compr_tstamp {
+ struct snd_compr_avail {
+       __u64 avail;
+       struct snd_compr_tstamp tstamp;
+-};
++} __attribute__((packed));
+ enum snd_compr_direction {
+       SND_COMPRESS_PLAYBACK = 0,
diff --git a/queue-3.15/alsa-hda-add-quirk-for-external-mic-on-lifebook-u904.patch b/queue-3.15/alsa-hda-add-quirk-for-external-mic-on-lifebook-u904.patch
new file mode 100644 (file)
index 0000000..7678112
--- /dev/null
@@ -0,0 +1,59 @@
+From 2041d56464a067461d7cc21734a0f024587ed2ff Mon Sep 17 00:00:00 2001
+From: David Henningsson <david.henningsson@canonical.com>
+Date: Fri, 13 Jun 2014 11:15:44 +0200
+Subject: ALSA: hda - Add quirk for external mic on Lifebook U904
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: David Henningsson <david.henningsson@canonical.com>
+
+commit 2041d56464a067461d7cc21734a0f024587ed2ff upstream.
+
+According to the bug reporter (Данило Шеган), the external mic
+starts to work and has proper jack detection if only pin 0x19
+is marked properly as an external headset mic.
+
+AlsaInfo at https://bugs.launchpad.net/ubuntu/+source/pulseaudio/+bug/1328587/+attachment/4128991/+files/AlsaInfo.txt
+
+BugLink: https://bugs.launchpad.net/bugs/1328587
+Signed-off-by: David Henningsson <david.henningsson@canonical.com>
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ sound/pci/hda/patch_realtek.c |    9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+--- a/sound/pci/hda/patch_realtek.c
++++ b/sound/pci/hda/patch_realtek.c
+@@ -4114,6 +4114,7 @@ enum {
+       ALC269_FIXUP_HEADSET_MIC,
+       ALC269_FIXUP_QUANTA_MUTE,
+       ALC269_FIXUP_LIFEBOOK,
++      ALC269_FIXUP_LIFEBOOK_EXTMIC,
+       ALC269_FIXUP_AMIC,
+       ALC269_FIXUP_DMIC,
+       ALC269VB_FIXUP_AMIC,
+@@ -4243,6 +4244,13 @@ static const struct hda_fixup alc269_fix
+               .chained = true,
+               .chain_id = ALC269_FIXUP_QUANTA_MUTE
+       },
++      [ALC269_FIXUP_LIFEBOOK_EXTMIC] = {
++              .type = HDA_FIXUP_PINS,
++              .v.pins = (const struct hda_pintbl[]) {
++                      { 0x19, 0x01a1903c }, /* headset mic, with jack detect */
++                      { }
++              },
++      },
+       [ALC269_FIXUP_AMIC] = {
+               .type = HDA_FIXUP_PINS,
+               .v.pins = (const struct hda_pintbl[]) {
+@@ -4716,6 +4724,7 @@ static const struct snd_pci_quirk alc269
+       SND_PCI_QUIRK(0x104d, 0x9084, "Sony VAIO", ALC275_FIXUP_SONY_HWEQ),
+       SND_PCI_QUIRK_VENDOR(0x104d, "Sony VAIO", ALC269_FIXUP_SONY_VAIO),
+       SND_PCI_QUIRK(0x10cf, 0x1475, "Lifebook", ALC269_FIXUP_LIFEBOOK),
++      SND_PCI_QUIRK(0x10cf, 0x1845, "Lifebook U904", ALC269_FIXUP_LIFEBOOK_EXTMIC),
+       SND_PCI_QUIRK(0x17aa, 0x20f2, "Thinkpad SL410/510", ALC269_FIXUP_SKU_IGNORE),
+       SND_PCI_QUIRK(0x17aa, 0x215e, "Thinkpad L512", ALC269_FIXUP_SKU_IGNORE),
+       SND_PCI_QUIRK(0x17aa, 0x21b8, "Thinkpad Edge 14", ALC269_FIXUP_SKU_IGNORE),
diff --git a/queue-3.15/alsa-hda-realtek-add-more-entry-for-enable-hp-mute-led.patch b/queue-3.15/alsa-hda-realtek-add-more-entry-for-enable-hp-mute-led.patch
new file mode 100644 (file)
index 0000000..5387c8a
--- /dev/null
@@ -0,0 +1,57 @@
+From 8a02b164d4bfac108bfe37e98108bff1e062bd3d Mon Sep 17 00:00:00 2001
+From: Kailang Yang <kailang@realtek.com>
+Date: Fri, 13 Jun 2014 17:16:31 +0800
+Subject: ALSA: hda/realtek - Add more entry for enable HP mute led
+
+From: Kailang Yang <kailang@realtek.com>
+
+commit 8a02b164d4bfac108bfe37e98108bff1e062bd3d upstream.
+
+More HP machine need mute led support.
+
+Signed-off-by: Kailang Yang <kailang@realtek.com>
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ sound/pci/hda/patch_realtek.c |   14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+
+--- a/sound/pci/hda/patch_realtek.c
++++ b/sound/pci/hda/patch_realtek.c
+@@ -4633,14 +4633,24 @@ static const struct snd_pci_quirk alc269
+       SND_PCI_QUIRK(0x103c, 0x1983, "HP Pavilion", ALC269_FIXUP_HP_MUTE_LED_MIC1),
+       SND_PCI_QUIRK(0x103c, 0x218b, "HP", ALC269_FIXUP_LIMIT_INT_MIC_BOOST_MUTE_LED),
+       /* ALC282 */
++      SND_PCI_QUIRK(0x103c, 0x220d, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
++      SND_PCI_QUIRK(0x103c, 0x220e, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
+       SND_PCI_QUIRK(0x103c, 0x220f, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
++      SND_PCI_QUIRK(0x103c, 0x2210, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
++      SND_PCI_QUIRK(0x103c, 0x2211, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
++      SND_PCI_QUIRK(0x103c, 0x2212, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
+       SND_PCI_QUIRK(0x103c, 0x2213, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
++      SND_PCI_QUIRK(0x103c, 0x2214, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
+       SND_PCI_QUIRK(0x103c, 0x2266, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
+       SND_PCI_QUIRK(0x103c, 0x2267, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
+       SND_PCI_QUIRK(0x103c, 0x2268, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
+       SND_PCI_QUIRK(0x103c, 0x2269, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
+       SND_PCI_QUIRK(0x103c, 0x226a, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
+       SND_PCI_QUIRK(0x103c, 0x226b, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
++      SND_PCI_QUIRK(0x103c, 0x226c, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
++      SND_PCI_QUIRK(0x103c, 0x226d, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
++      SND_PCI_QUIRK(0x103c, 0x226e, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
++      SND_PCI_QUIRK(0x103c, 0x226f, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
+       SND_PCI_QUIRK(0x103c, 0x227a, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
+       SND_PCI_QUIRK(0x103c, 0x227b, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
+       SND_PCI_QUIRK(0x103c, 0x229e, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
+@@ -4680,6 +4690,10 @@ static const struct snd_pci_quirk alc269
+       SND_PCI_QUIRK(0x103c, 0x22c8, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
+       SND_PCI_QUIRK(0x103c, 0x22c3, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
+       SND_PCI_QUIRK(0x103c, 0x22c4, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
++      SND_PCI_QUIRK(0x103c, 0x2334, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
++      SND_PCI_QUIRK(0x103c, 0x2335, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
++      SND_PCI_QUIRK(0x103c, 0x2336, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
++      SND_PCI_QUIRK(0x103c, 0x2337, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
+       SND_PCI_QUIRK_VENDOR(0x103c, "HP", ALC269_FIXUP_HP_MUTE_LED),
+       SND_PCI_QUIRK(0x1043, 0x103f, "ASUS TX300", ALC282_FIXUP_ASUS_TX300),
+       SND_PCI_QUIRK(0x1043, 0x106d, "Asus K53BE", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),
diff --git a/queue-3.15/alsa-hda-realtek-add-support-of-alc891-codec.patch b/queue-3.15/alsa-hda-realtek-add-support-of-alc891-codec.patch
new file mode 100644 (file)
index 0000000..ee66d16
--- /dev/null
@@ -0,0 +1,29 @@
+From b6c5fbad16aa5026f508093a8d651c25e1cb6179 Mon Sep 17 00:00:00 2001
+From: Kailang Yang <kailang@realtek.com>
+Date: Thu, 5 Jun 2014 11:13:44 +0800
+Subject: ALSA: hda/realtek - Add support of ALC891 codec
+
+From: Kailang Yang <kailang@realtek.com>
+
+commit b6c5fbad16aa5026f508093a8d651c25e1cb6179 upstream.
+
+New codec support for ALC891.
+
+Signed-off-by: Kailang Yang <kailang@realtek.com>
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ sound/pci/hda/patch_realtek.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/sound/pci/hda/patch_realtek.c
++++ b/sound/pci/hda/patch_realtek.c
+@@ -5809,6 +5809,7 @@ static const struct hda_codec_preset snd
+       { .id = 0x10ec0670, .name = "ALC670", .patch = patch_alc662 },
+       { .id = 0x10ec0671, .name = "ALC671", .patch = patch_alc662 },
+       { .id = 0x10ec0680, .name = "ALC680", .patch = patch_alc680 },
++      { .id = 0x10ec0867, .name = "ALC891", .patch = patch_alc882 },
+       { .id = 0x10ec0880, .name = "ALC880", .patch = patch_alc880 },
+       { .id = 0x10ec0882, .name = "ALC882", .patch = patch_alc882 },
+       { .id = 0x10ec0883, .name = "ALC883", .patch = patch_alc882 },
diff --git a/queue-3.15/alsa-hda-verify-pin-converter-connection-on-unsol-event-for-hsw-and-vlv.patch b/queue-3.15/alsa-hda-verify-pin-converter-connection-on-unsol-event-for-hsw-and-vlv.patch
new file mode 100644 (file)
index 0000000..40586a9
--- /dev/null
@@ -0,0 +1,50 @@
+From b4f75aea553a2146bbdd159c397a2ac42cbb9902 Mon Sep 17 00:00:00 2001
+From: Mengdong Lin <mengdong.lin@intel.com>
+Date: Thu, 12 Jun 2014 14:42:25 +0800
+Subject: ALSA: hda - verify pin:converter connection on unsol event for HSW and VLV
+
+From: Mengdong Lin <mengdong.lin@intel.com>
+
+commit b4f75aea553a2146bbdd159c397a2ac42cbb9902 upstream.
+
+This patch will verify the pin's coverter selection for an active stream
+when an unsol event reports this pin becomes available again after a display
+mode change or hot-plug event.
+
+For Haswell+ and Valleyview: display mode change or hot-plug can change the
+transcoder:port connection and make all the involved audio pins share the 1st
+converter. So the stream using 1st convertor will flow to multiple pins
+but active streams using other converters will fail. This workaround
+is to assure the pin selects the right conveter and an assigned converter is
+not shared by other unused pins.
+
+Signed-off-by: Mengdong Lin <mengdong.lin@intel.com>
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ sound/pci/hda/patch_hdmi.c |   10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+--- a/sound/pci/hda/patch_hdmi.c
++++ b/sound/pci/hda/patch_hdmi.c
+@@ -1598,10 +1598,18 @@ static bool hdmi_present_sense(struct hd
+                * Re-setup pin and infoframe. This is needed e.g. when
+                * - sink is first plugged-in (infoframe is not set up if !monitor_present)
+                * - transcoder can change during stream playback on Haswell
++               *   and this can make HW reset converter selection on a pin.
+                */
+-              if (eld->eld_valid && !old_eld_valid && per_pin->setup)
++              if (eld->eld_valid && !old_eld_valid && per_pin->setup) {
++                      if (is_haswell_plus(codec) || is_valleyview(codec)) {
++                              intel_verify_pin_cvt_connect(codec, per_pin);
++                              intel_not_share_assigned_cvt(codec, pin_nid,
++                                                      per_pin->mux_idx);
++                      }
++
+                       hdmi_setup_audio_infoframe(codec, per_pin,
+                                                  per_pin->non_pcm);
++              }
+       }
+       if (eld_changed)
index 52c4704f54fbbc0cbbd0f4082905915cf2a7a62f..623a29b997604b7adff93bbedf31683de2efedd9 100644 (file)
@@ -47,3 +47,8 @@ iio-fix-endianness-issue-in-ak8975_read_axis.patch
 iio-fix-two-mpl3115-issues-in-measurement-conversion.patch
 lzo-properly-check-for-overruns.patch
 lz4-ensure-length-does-not-wrap.patch
+alsa-compress-cancel-the-optimization-of-compiler-and-fix.patch
+alsa-hda-realtek-add-support-of-alc891-codec.patch
+alsa-hda-realtek-add-more-entry-for-enable-hp-mute-led.patch
+alsa-hda-verify-pin-converter-connection-on-unsol-event-for-hsw-and-vlv.patch
+alsa-hda-add-quirk-for-external-mic-on-lifebook-u904.patch