rpms/kernel/F-8 linux-2.6-alsa-trident-spdif.patch, NONE, 1.1 kernel.spec, 1.496, 1.497

[Chuck Ebbert (cebbert)]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3262

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-alsa-trident-spdif.patch 
Log Message:
* Thu Jul 03 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.25.9-42
- Linux 2.6.25.10
- Reverted stable patch, not needed with utrace:
	x86_64-ptrace-fix-sys32_ptrace-task_struct-leak.patch
- Reverted part of this stable patch against drivers/net/wireless/strip.c
  (the driver eventually gets removed as part of the wireless updates):
	tty-fix-for-tty-operations-bugs.patch


linux-2.6-alsa-trident-spdif.patch:

--- NEW FILE linux-2.6-alsa-trident-spdif.patch ---
From: Pierre Ossman <drzeus at drzeus.cx>
Date: Mon, 23 Jun 2008 09:45:47 +0000 (+0200)
Subject: ALSA: trident - pause s/pdif output
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftiwai%2Fsound-2.6.git;a=commitdiff_plain;h=f19a62ecba9d0963cee2b673f0ad34917b5e57ad

ALSA: trident - pause s/pdif output

Stop the S/PDIF DMA engine and output when the device is told to pause.
It will keep on looping the current buffer contents if this isn't done.

Signed-off-by: Pierre Ossman <drzeus at drzeus.cx>
Tested-by: Rene Herman <rene.herman at gmail.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
---

diff --git a/sound/pci/trident/trident_main.c b/sound/pci/trident/trident_main.c
index bbcee2c..a69b420 100644
--- a/sound/pci/trident/trident_main.c
+++ b/sound/pci/trident/trident_main.c
@@ -1590,7 +1590,10 @@ static int snd_trident_trigger(struct snd_pcm_substream *substream,
 	if (spdif_flag) {
 		if (trident->device != TRIDENT_DEVICE_ID_SI7018) {
 			outl(trident->spdif_pcm_bits, TRID_REG(trident, NX_SPCSTATUS));
-			outb(trident->spdif_pcm_ctrl, TRID_REG(trident, NX_SPCTRL_SPCSO + 3));
+			val = trident->spdif_pcm_ctrl;
+			if (!go)
+				val &= ~(0x28);
+			outb(val, TRID_REG(trident, NX_SPCTRL_SPCSO + 3));
 		} else {
 			outl(trident->spdif_pcm_bits, TRID_REG(trident, SI_SPDIF_CS));
 			val = inl(TRID_REG(trident, SI_SERIAL_INTF_CTRL)) | SPDIF_EN;


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v
retrieving revision 1.496
retrieving revision 1.497
diff -u -r1.496 -r1.497
--- kernel.spec	18 Jul 2008 16:52:22 -0000	1.496
+++ kernel.spec	18 Jul 2008 22:13:14 -0000	1.497
@@ -582,6 +582,7 @@
 Patch91: linux-2.6-alsa-hda-codec-add-AD1884A-x300.patch
 Patch92: linux-2.6-alsa-hda-codec-add-AD1884A.patch
 Patch93: linux-2.6-alsa-kill-annoying-messages.patch
+Patch94: linux-2.6-alsa-trident-spdif.patch
 
 Patch123: linux-2.6-ppc-rtc.patch
 Patch130: linux-2.6-ppc-use-libgcc.patch
@@ -1001,6 +1002,8 @@
 ApplyPatch linux-2.6-alsa-hda-codec-add-AD1884A-x300.patch
 # kill annoying messages
 ApplyPatch linux-2.6-alsa-kill-annoying-messages.patch
+# trident fix from F9
+ApplyPatch linux-2.6-alsa-trident-spdif.patch
 
 # Nouveau DRM + drm fixes
 ApplyPatch nouveau-drm.patch
@@ -1840,6 +1843,9 @@
 
 
 %changelog
+* Fri Jul 18 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.25.11-57
+- Add ALSA Trident driver fix from F9 kernel. (F9#453464)
+
 * Fri Jul 18 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.25.11-56
 - Add "show backtrace on all CPUs" (SysRq-l).