[kernel] r13982 - in dists/lenny/linux-2.6/debian: . patches/bugfix/all patches/series

[Moritz Muehlenhoff]

Author: jmm
Date: Mon Jul 20 22:47:24 2009
New Revision: 13982

Log:
* ALSA: hda_intel: enable snoop for NVidia HDA controller (Closes: #521192)

Added:
   dists/lenny/linux-2.6/debian/patches/bugfix/all/sound-enable-snoop-for-nvidia-hda.patch
Modified:
   dists/lenny/linux-2.6/debian/changelog
   dists/lenny/linux-2.6/debian/patches/series/18

Modified: dists/lenny/linux-2.6/debian/changelog
==============================================================================
--- dists/lenny/linux-2.6/debian/changelog	Mon Jul 20 05:48:38 2009	(r13981)
+++ dists/lenny/linux-2.6/debian/changelog	Mon Jul 20 22:47:24 2009	(r13982)
@@ -19,6 +19,7 @@
   [ Moritz Muehlenhoff ]
   * fbdev/atyfb: Fix display corruption on some PowerMacs & PowerBooks
     (Closes: #420582)
+  * ALSA: hda_intel: enable snoop for NVidia HDA controller (Closes: #521192)
 
   [ dann frazier ]
   * sata_nv: avoid link reset on controllers where it's broken

Added: dists/lenny/linux-2.6/debian/patches/bugfix/all/sound-enable-snoop-for-nvidia-hda.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/lenny/linux-2.6/debian/patches/bugfix/all/sound-enable-snoop-for-nvidia-hda.patch	Mon Jul 20 22:47:24 2009	(r13982)
@@ -0,0 +1,44 @@
+From 320dcc30f498e0a8b282b14cf0feed1897ea3b34 Mon Sep 17 00:00:00 2001
+From: Peer Chen <peerchen at gmail.com>
+Date: Wed, 20 Aug 2008 16:43:24 -0700
+Subject: [PATCH] ALSA: hda_intel: enable snoop for nvidia HDA controller
+
+Enable the snoop for nvidia hda controller to avoid data coherence issue.
+
+Signed-off-by: Peer Chen <peerchen at gmail.com>
+Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
+Signed-off-by: Takashi Iwai <tiwai at suse.de>
+---
+ sound/pci/hda/hda_intel.c |    9 +++++++++
+ 1 files changed, 9 insertions(+), 0 deletions(-)
+
+diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
+index a73d6ca..1c53e33 100644
+--- a/sound/pci/hda/hda_intel.c
++++ b/sound/pci/hda/hda_intel.c
+@@ -278,6 +278,9 @@ enum {
+ /* Defines for Nvidia HDA support */
+ #define NVIDIA_HDA_TRANSREG_ADDR      0x4e
+ #define NVIDIA_HDA_ENABLE_COHBITS     0x0f
++#define NVIDIA_HDA_ISTRM_COH          0x4d
++#define NVIDIA_HDA_OSTRM_COH          0x4c
++#define NVIDIA_HDA_ENABLE_COHBIT      0x01
+ 
+ /* Defines for Intel SCH HDA snoop control */
+ #define INTEL_SCH_HDA_DEVC      0x78
+@@ -900,6 +903,12 @@ static void azx_init_pci(struct azx *chip)
+ 		update_pci_byte(chip->pci,
+ 				NVIDIA_HDA_TRANSREG_ADDR,
+ 				0x0f, NVIDIA_HDA_ENABLE_COHBITS);
++		update_pci_byte(chip->pci,
++				NVIDIA_HDA_ISTRM_COH,
++				0x01, NVIDIA_HDA_ENABLE_COHBIT);
++		update_pci_byte(chip->pci,
++				NVIDIA_HDA_OSTRM_COH,
++				0x01, NVIDIA_HDA_ENABLE_COHBIT);
+ 		break;
+ 	case AZX_DRIVER_SCH:
+ 		pci_read_config_word(chip->pci, INTEL_SCH_HDA_DEVC, &snoop);
+-- 
+1.6.2
+

Modified: dists/lenny/linux-2.6/debian/patches/series/18
==============================================================================
--- dists/lenny/linux-2.6/debian/patches/series/18	Mon Jul 20 05:48:38 2009	(r13981)
+++ dists/lenny/linux-2.6/debian/patches/series/18	Mon Jul 20 22:47:24 2009	(r13982)
@@ -8,3 +8,4 @@
 + bugfix/all/drivers-ata-sata_nv-broken-hardreset.patch
 + bugfix/all/libata-make-sure-port-is-thawed-when-skipping-reset.patch
 + bugfix/all/add-fno-delete-null-pointer-checks-to-CFLAGS.patch
++ bugfix/all/sound-enable-snoop-for-nvidia-hda.patch
\ No newline at end of file