rpms/kernel/F-9 linux-2.6-alsa-trident-spdif.patch, NONE, 1.1 kernel.spec, 1.695, 1.696

[Dave Jones (davej)]

Author: davej

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

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-alsa-trident-spdif.patch 
Log Message:
ALSA: trident - pause s/pdif output (#453464)

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-9/kernel.spec,v
retrieving revision 1.695
retrieving revision 1.696
diff -u -r1.695 -r1.696
--- kernel.spec	27 Jun 2008 19:34:18 -0000	1.695
+++ kernel.spec	30 Jun 2008 19:36:39 -0000	1.696
@@ -608,8 +608,9 @@
 
 Patch410: linux-2.6-alsa-kill-annoying-messages.patch
 Patch411: linux-2.6-alsa-hda-codec-add-AD1884A-mobile.patch
-Patch411: linux-2.6-alsa-hda-codec-add-AD1884A.patch
+Patch412: linux-2.6-alsa-hda-codec-add-AD1884A.patch
 Patch413: linux-2.6-alsa-hda-codec-add-AD1884A-x300.patch
+Patch414: linux-2.6-alsa-trident-spdif.patch
 
 # filesystem patches
 Patch421: linux-2.6-squashfs.patch
@@ -1149,6 +1150,8 @@
 ApplyPatch linux-2.6-alsa-hda-codec-add-AD1884A.patch
 ApplyPatch linux-2.6-alsa-hda-codec-add-AD1884A-mobile.patch
 ApplyPatch linux-2.6-alsa-hda-codec-add-AD1884A-x300.patch
+# ALSA: trident - pause s/pdif output
+ApplyPatch linux-2.6-alsa-trident-spdif.patch
 
 # Filesystem patches.
 # cifs
@@ -1858,6 +1861,9 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
 
 %changelog
+* Mon Jun 30 2008 Dave Jones <davej at redhat.com>
+- ALSA: trident - pause s/pdif output (#453464)
+
 * Fri Jun 27 2008 John W. Linville <linville at redhat.com> 2.6.25.9-76
 - Upstream wireless fixes from 2008-06-27
   (http://marc.info/?l=linux-wireless&m=121459423021061&w=2)