diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-07-08 13:06:08 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-07-08 13:06:08 +0200 |
| commit | bd19f41a29618dac69605cf06f93faa9b2e7dfa6 (patch) | |
| tree | b253799dbd38ede15341257295a6ccc101fb1b3e | |
| parent | bd6739cb25d82a774512acb564a128cb50c283e3 (diff) | |
| download | alsa-driver-build-unstable-bd19f41a29618dac69605cf06f93faa9b2e7dfa6.tar.gz | |
Refresh hda_intel.patch
Signed-off-by: Takashi Iwai <tiwai@suse.de>
| -rw-r--r-- | alsa/pci/hda/hda_intel.patch | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/alsa/pci/hda/hda_intel.patch b/alsa/pci/hda/hda_intel.patch index 94e972b5b..a7e1e2068 100644 --- a/alsa/pci/hda/hda_intel.patch +++ b/alsa/pci/hda/hda_intel.patch @@ -1,12 +1,12 @@ ---- ../../alsa-kernel/pci/hda/hda_intel.c 2014-03-01 11:24:19.736897582 +0100 -+++ hda_intel.c 2014-03-01 11:38:27.336629926 +0100 +--- ../../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 @@ -1,3 +1,4 @@ +#include "hda_intel_hack.c" /* * * hda_intel.c - Implementation of primary alsa driver code base -@@ -47,7 +48,9 @@ - #include <linux/reboot.h> +@@ -46,7 +47,9 @@ + #include <linux/mutex.h> #include <linux/io.h> #include <linux/pm_runtime.h> +#ifdef HAVE_TIMECOUNTER @@ -15,7 +15,7 @@ #include <linux/time.h> #include <linux/completion.h> -@@ -282,6 +285,57 @@ +@@ -359,6 +362,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; -@@ -963,6 +1017,7 @@ +@@ -1142,6 +1196,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) { -@@ -970,10 +1025,15 @@ +@@ -1149,10 +1204,15 @@ vga_inactive = true; pci_dev_put(p); } @@ -97,7 +97,7 @@ /* * white/black-listing for position_fix */ -@@ -1093,6 +1153,14 @@ +@@ -1296,6 +1356,14 @@ {} }; @@ -112,7 +112,7 @@ static void check_msi(struct azx *chip) { const struct snd_pci_quirk *q; -@@ -1101,7 +1169,11 @@ +@@ -1304,7 +1372,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, -@@ -1131,7 +1203,7 @@ +@@ -1334,7 +1406,7 @@ if (snoop) { u8 val; pci_read_config_byte(chip->pci, 0x42, &val); @@ -133,16 +133,16 @@ snoop = false; } break; -@@ -1292,7 +1364,7 @@ +@@ -1492,7 +1564,7 @@ PCI_DEVICE_ID_ATI_SBX00_SMBUS, NULL); if (p_smbus) { - if (p_smbus->revision < 0x30) + if (snd_pci_revision(p_smbus) < 0x30) - gcap &= ~ICH6_GCAP_64OK; + gcap &= ~AZX_GCAP_64OK; pci_dev_put(p_smbus); } -@@ -1532,7 +1604,11 @@ +@@ -1736,7 +1808,11 @@ struct azx_pcm *apcm = snd_pcm_substream_chip(substream); struct azx *chip = apcm->chip; if (!azx_snoop(chip)) |