| From tiwai@suse.de Tue Apr 8 14:31:41 2014 |
| From: Takashi Iwai <tiwai@suse.de> |
| 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 <anssi.hannula@iki.fi>, Christian Güdel <cg@dmesg.ch> |
| Message-ID: <1396975740-22160-1-git-send-email-tiwai@suse.de> |
| |
| From: Takashi Iwai <tiwai@suse.de> |
| |
| 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 <cg@dmesg.ch> |
| Reported-by: Anssi Hannula <anssi.hannula@iki.fi> |
| Signed-off-by: Takashi Iwai <tiwai@suse.de> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| |
| 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 |
