From 64bb1fafb84eb68a68fa2726450c357793b7c9bb Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 8 Apr 2014 14:32:17 -0700 Subject: [PATCH] 3.14-stable patches added patches: revert-alsa-hda-increment-default-stream-numbers-for-amd-hdmi-controllers.patch --- ...eam-numbers-for-amd-hdmi-controllers.patch | 53 +++++++++++++++++++ queue-3.14/series | 1 + 2 files changed, 54 insertions(+) create mode 100644 queue-3.14/revert-alsa-hda-increment-default-stream-numbers-for-amd-hdmi-controllers.patch create mode 100644 queue-3.14/series diff --git a/queue-3.14/revert-alsa-hda-increment-default-stream-numbers-for-amd-hdmi-controllers.patch b/queue-3.14/revert-alsa-hda-increment-default-stream-numbers-for-amd-hdmi-controllers.patch new file mode 100644 index 00000000000..c3dc8101943 --- /dev/null +++ b/queue-3.14/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 diff --git a/queue-3.14/series b/queue-3.14/series new file mode 100644 index 00000000000..a2e8e40f79a --- /dev/null +++ b/queue-3.14/series @@ -0,0 +1 @@ +revert-alsa-hda-increment-default-stream-numbers-for-amd-hdmi-controllers.patch -- 2.47.3