diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-10-31 09:34:02 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-10-31 09:34:02 +0100 |
| commit | 08c57df70cfbf73a305c176f54a0be9debfd163f (patch) | |
| tree | 300d6addb4edcd1b352c9bdeae2f66efc8840e24 | |
| parent | ab5308bde202e360e6f53182b01a8d724a0f3dae (diff) | |
| download | alsa-driver-build-unstable-08c57df70cfbf73a305c176f54a0be9debfd163f.tar.gz | |
Refresh pci/hda/hda_intel.patch
For cmi8888 workaround in the upstream.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
| -rw-r--r-- | alsa/pci/hda/hda_intel.patch | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/alsa/pci/hda/hda_intel.patch b/alsa/pci/hda/hda_intel.patch index a7e1e2068..d6ec14194 100644 --- a/alsa/pci/hda/hda_intel.patch +++ b/alsa/pci/hda/hda_intel.patch @@ -1,5 +1,5 @@ ---- ../../alsa-kernel/pci/hda/hda_intel.c 2014-07-08 12:41:42.416313289 +0200 -+++ hda_intel.c 2014-07-08 13:05:19.641033229 +0200 +--- ../../alsa-kernel/pci/hda/hda_intel.c 2014-10-29 16:17:16.582376566 +0100 ++++ hda_intel.c 2014-10-31 09:32:43.120445370 +0100 @@ -1,3 +1,4 @@ +#include "hda_intel_hack.c" /* @@ -15,7 +15,7 @@ #include <linux/time.h> #include <linux/completion.h> -@@ -359,6 +362,57 @@ +@@ -362,6 +365,57 @@ }; #ifdef CONFIG_X86 @@ -73,7 +73,7 @@ static void __mark_pages_wc(struct azx *chip, struct snd_dma_buffer *dmab, bool on) { int pages; -@@ -1142,6 +1196,7 @@ +@@ -1177,6 +1231,7 @@ static bool check_hdmi_disabled(struct pci_dev *pci) { bool vga_inactive = false; @@ -81,7 +81,7 @@ struct pci_dev *p = get_bound_vga(pci); if (p) { -@@ -1149,10 +1204,15 @@ +@@ -1184,10 +1239,15 @@ vga_inactive = true; pci_dev_put(p); } @@ -97,7 +97,7 @@ /* * white/black-listing for position_fix */ -@@ -1296,6 +1356,14 @@ +@@ -1331,6 +1391,14 @@ {} }; @@ -112,7 +112,7 @@ static void check_msi(struct azx *chip) { const struct snd_pci_quirk *q; -@@ -1304,7 +1372,11 @@ +@@ -1339,7 +1407,11 @@ chip->msi = !!enable_msi; return; } @@ -124,7 +124,7 @@ q = snd_pci_quirk_lookup(chip->pci, msi_black_list); if (q) { dev_info(chip->card->dev, -@@ -1334,7 +1406,7 @@ +@@ -1369,7 +1441,7 @@ if (snoop) { u8 val; pci_read_config_byte(chip->pci, 0x42, &val); @@ -133,7 +133,7 @@ snoop = false; } break; -@@ -1492,7 +1564,7 @@ +@@ -1528,7 +1600,7 @@ PCI_DEVICE_ID_ATI_SBX00_SMBUS, NULL); if (p_smbus) { @@ -142,10 +142,10 @@ gcap &= ~AZX_GCAP_64OK; pci_dev_put(p_smbus); } -@@ -1736,7 +1808,11 @@ +@@ -1772,7 +1844,11 @@ struct azx_pcm *apcm = snd_pcm_substream_chip(substream); struct azx *chip = apcm->chip; - if (!azx_snoop(chip)) + if (!azx_snoop(chip) && chip->driver_type != AZX_DRIVER_CMEDIA) +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29) area->vm_page_prot = pgprot_writecombine(area->vm_page_prot); +#else |