diff --git a/packages/linux/patches/3.14/linux-999.01-0001-ALSA-hda-Do-not-assign-streams-in-reverse-order.patch b/packages/linux/patches/3.14/linux-999.01-0001-ALSA-hda-Do-not-assign-streams-in-reverse-order.patch deleted file mode 100644 index 2bf7219013..0000000000 --- a/packages/linux/patches/3.14/linux-999.01-0001-ALSA-hda-Do-not-assign-streams-in-reverse-order.patch +++ /dev/null @@ -1,54 +0,0 @@ -From b5e9423f4dfbef8da81217310c99cdcb79aaf25d Mon Sep 17 00:00:00 2001 -From: Anssi Hannula -Date: Mon, 7 Apr 2014 22:16:52 +0300 -Subject: [PATCH] ALSA: hda - Do not assign streams in reverse order -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Currently stream numbers are assigned in reverse order. - -Unfortunately commit 7546abfb8e1f9933b5 ("ALSA: hda - Increment -default stream numbers for AMD HDMI controllers") assumed this was not -the case (specifically, it had the "old cards had single device only" -=> "extra unused stream numbers do not matter" assumption), causing -non-working audio regressions for AMD Radeon HDMI users. - -Change the stream numbers to be assigned in forward order. - -Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=77002 -Reported-by: Christian Güdel -Signed-off-by: Anssi Hannula -Tested-by: Christian Güdel -Cc: Alex Deucher -Cc: # 3.14 ---- - sound/pci/hda/hda_intel.c | 9 +++++---- - 1 file changed, 5 insertions(+), 4 deletions(-) - -diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c -index e354ab1ec20f..7a7b7b10dddf 100644 ---- a/sound/pci/hda/hda_intel.c -+++ b/sound/pci/hda/hda_intel.c -@@ -1856,13 +1856,14 @@ azx_assign_device(struct azx *chip, struct snd_pcm_substream *substream) - struct azx_dev *azx_dev = &chip->azx_dev[dev]; - dsp_lock(azx_dev); - if (!azx_dev->opened && !dsp_is_locked(azx_dev)) { -- res = azx_dev; -- if (res->assigned_key == key) { -- res->opened = 1; -- res->assigned_key = key; -+ if (azx_dev->assigned_key == key) { -+ azx_dev->opened = 1; -+ azx_dev->assigned_key = key; - dsp_unlock(azx_dev); - return azx_dev; - } -+ if (!res) -+ res = azx_dev; - } - dsp_unlock(azx_dev); - } --- -1.8.4.5 - diff --git a/packages/linux/patches/3.14/linux-999.01-revert-alsa-hda-increment-default-stream-numbers-for-amd-hdmi-controllers.patch b/packages/linux/patches/3.14/linux-999.01-revert-alsa-hda-increment-default-stream-numbers-for-amd-hdmi-controllers.patch new file mode 100644 index 0000000000..c3dc810194 --- /dev/null +++ b/packages/linux/patches/3.14/linux-999.01-revert-alsa-hda-increment-default-stream-numbers-for-amd-hdmi-controllers.patch @@ -0,0 +1,53 @@ +From tiwai@suse.de Tue Apr 8 14:31:41 2014 +From: Takashi Iwai +Date: Tue, 8 Apr 2014 18:49:00 +0200 +Subject: Revert "ALSA: hda - Increment default stream numbers for AMD HDMI controllers" +To: stable@vger.kernel.org +Cc: Anssi Hannula , Christian Güdel +Message-ID: <1396975740-22160-1-git-send-email-tiwai@suse.de> + +From: Takashi Iwai + +This reverts commit 7546abfb8e1f9933b549f05898377e9444ee4cb2. + +The commit [7546abfb: ALSA: hda - Increment default stream numbers for +AMD HDMI controllers] introduced a regression where the AMD HDMI +playback streams don't work properly. As the simplest fix, this patch +reverts that commit. + +The upstream code has been changed largely and already contains +another fix (by changing the stream assignment order), this revert +should be applied only to 3.14 kernel where the regression was +introduced. + +Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=77002 +Reported-by: Christian Güdel +Reported-by: Anssi Hannula +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman +--- + +Greg, there is no upstream commit id due to the reason describe in the +above. It's a simple revert, so please take as is. + +thanks, + +Takashi + + sound/pci/hda/hda_intel.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/sound/pci/hda/hda_intel.c ++++ b/sound/pci/hda/hda_intel.c +@@ -297,9 +297,9 @@ enum { SDI0, SDI1, SDI2, SDI3, SDO0, SDO + #define ULI_NUM_CAPTURE 5 + #define ULI_NUM_PLAYBACK 6 + +-/* ATI HDMI may have up to 8 playbacks and 0 capture */ ++/* ATI HDMI has 1 playback and 0 capture */ + #define ATIHDMI_NUM_CAPTURE 0 +-#define ATIHDMI_NUM_PLAYBACK 8 ++#define ATIHDMI_NUM_PLAYBACK 1 + + /* TERA has 4 playback and 3 capture */ + #define TERA_NUM_CAPTURE 3