[alsa-cvslog] alsa-driver: ALSA driver repository - compatibility code, new drivers and standalone
Brought to you by:
perex
Menu
▾
▴
[alsa-cvslog] alsa-driver: ALSA driver repository - compatibility code, new drivers and standalone building branch, master now at v1.0.25-26-ge0e476a
|
From: <nor...@al...> - 2012-05-28 09:29:42
|
Hello,
This is an automated email from the git hooks/update script, it was
generated because a ref change was pushed to the repository.
Updating branch, master,
via e0e476a1473f4f6e4ea1186b7579b383f9c22f40 (commit)
via d2471336a10e6e3ded31895d034b14faa00d5048 (commit)
via 90f18531daf8e6f03ec1fc31d8c83fbcdc9987d7 (commit)
via 5e98b4120dac0820bcb8caf0915104cf45ddbfc8 (commit)
via 220ad213aad3861cf7dd1e242b1dfffb14d24db4 (commit)
via e3dfeab0163308a0c7c8f2326c9370823daa5cf4 (commit)
via 6984a804f7918bc2b1445e53054032389e4b391a (commit)
via 22c3d16d064c3e50525fe4ab6cfbb4ae3b5d2321 (commit)
via f1aced745848472c298785c20de4980ce3c7b52e (commit)
via ba502d20a09d3726295ef8e5609cfb1598530e46 (commit)
from b54e5c2bb9738f5b641f5119a2de9f4ab81e24c4 (commit)
- Log -----------------------------------------------------------------
commit e0e476a1473f4f6e4ea1186b7579b383f9c22f40
Author: Takashi Iwai <ti...@su...>
AuthorDate: Mon May 21 11:26:25 2012 +0200
Commit: Takashi Iwai <ti...@su...>
CommitDate: Mon May 21 11:26:25 2012 +0200
Add missing built stubs for soc/generic and soc/ux500
Signed-off-by: Takashi Iwai <ti...@su...>
commit d2471336a10e6e3ded31895d034b14faa00d5048
Author: Takashi Iwai <ti...@su...>
AuthorDate: Tue May 15 12:41:37 2012 +0200
Commit: Takashi Iwai <ti...@su...>
CommitDate: Tue May 15 12:41:37 2012 +0200
Yet again the build fix for hda_intel.c
vga_default_device() isn't always defined properly in old kernels.
So, we need to patch hda_intel.c again. Uglier but no better way.
Signed-off-by: Takashi Iwai <ti...@su...>
commit 90f18531daf8e6f03ec1fc31d8c83fbcdc9987d7
Author: Takashi Iwai <ti...@su...>
AuthorDate: Tue May 15 12:22:52 2012 +0200
Commit: Takashi Iwai <ti...@su...>
CommitDate: Tue May 15 12:22:52 2012 +0200
Remove vga_default_device() hack for hda_intel.c
This breaks the build with old kernel such as 2.6.32, since linux/vgaarb.h
isn't protected properly for double reads...
Signed-off-by: Takashi Iwai <ti...@su...>
commit 5e98b4120dac0820bcb8caf0915104cf45ddbfc8
Author: Takashi Iwai <ti...@su...>
AuthorDate: Tue May 15 12:21:07 2012 +0200
Commit: Takashi Iwai <ti...@su...>
CommitDate: Tue May 15 12:21:07 2012 +0200
Add missing define of CONFIG_HAVE_V4L2_CTRLS in config.h.in
Signed-off-by: Takashi Iwai <ti...@su...>
commit 220ad213aad3861cf7dd1e242b1dfffb14d24db4
Author: Takashi Iwai <ti...@su...>
AuthorDate: Tue May 15 11:49:19 2012 +0200
Commit: Takashi Iwai <ti...@su...>
CommitDate: Tue May 15 11:49:19 2012 +0200
Add liux/vgaarb.h and linux/vga_switcheroo.h checks to configure
Signed-off-by: Takashi Iwai <ti...@su...>
commit e3dfeab0163308a0c7c8f2326c9370823daa5cf4
Author: Takashi Iwai <ti...@su...>
AuthorDate: Tue May 15 11:40:55 2012 +0200
Commit: Takashi Iwai <ti...@su...>
CommitDate: Tue May 15 11:40:55 2012 +0200
Add more build workarounds for hda_intel.c
Signed-off-by: Takashi Iwai <ti...@su...>
commit 6984a804f7918bc2b1445e53054032389e4b391a
Author: Takashi Iwai <ti...@su...>
AuthorDate: Tue May 15 11:35:42 2012 +0200
Commit: Takashi Iwai <ti...@su...>
CommitDate: Tue May 15 11:35:42 2012 +0200
Fix the build of firewire/amdtp.c with older kernels
Signed-off-by: Takashi Iwai <ti...@su...>
commit 22c3d16d064c3e50525fe4ab6cfbb4ae3b5d2321
Author: Takashi Iwai <ti...@su...>
AuthorDate: Tue May 15 08:53:02 2012 +0200
Commit: Takashi Iwai <ti...@su...>
CommitDate: Tue May 15 08:53:02 2012 +0200
Add a hack for vga-switcheroo support in hda_intel.c
Signed-off-by: Takashi Iwai <ti...@su...>
commit f1aced745848472c298785c20de4980ce3c7b52e
Author: Takashi Iwai <ti...@su...>
AuthorDate: Fri May 11 14:58:37 2012 +0200
Commit: Takashi Iwai <ti...@su...>
CommitDate: Fri May 11 14:58:37 2012 +0200
Fix a typo in tea575x-tuner.c
Signed-off-by: Takashi Iwai <ti...@su...>
commit ba502d20a09d3726295ef8e5609cfb1598530e46
Author: Takashi Iwai <ti...@su...>
AuthorDate: Tue May 8 18:07:56 2012 +0200
Commit: Takashi Iwai <ti...@su...>
CommitDate: Tue May 8 18:07:56 2012 +0200
Add a build stub for hda_auto_parser.c
Signed-off-by: Takashi Iwai <ti...@su...>
-----------------------------------------------------------------------
Diffstat:
configure.in | 2 ++
firewire/amdtp.c | 3 +++
i2c/other/tea575x-tuner.c | 2 +-
include/config.h.in | 1 +
pci/hda/hda_auto_parser.c | 3 +++
pci/hda/hda_intel.patch | 38 +++++++++++++++++++++++++++-----------
pci/hda/hda_intel_hack.c | 14 ++++++++++++++
{aoa => soc/generic}/Makefile | 3 +--
soc/generic/simple-card.c | 2 ++
{aoa => soc/ux500}/Makefile | 3 +--
soc/ux500/ux500_msp_dai.c | 2 ++
soc/ux500/ux500_msp_i2s.c | 2 ++
12 files changed, 59 insertions(+), 16 deletions(-)
Patch -------------- (max 1500 lines)
diff --git a/configure.in b/configure.in
index 9a4e7c1..13d29c7 100644
--- a/configure.in
+++ b/configure.in
@@ -1587,6 +1587,8 @@ CHECK_KERNEL_HEADER(linux/dmi.h, [#include \"dmi_compat.h\"
])
CHECK_KERNEL_HEADER(linux/bitrev.h)
CHECK_KERNEL_HEADER(linux/hrtimer.h)
+CHECK_KERNEL_HEADER(linux/vgaarb.h)
+CHECK_KERNEL_HEADER(linux/vga_switcheroo.h)
CHECK_KERNEL_HEADER(linux/gcd.h, [#include \"gcd_compat.h\"
])
CHECK_KERNEL_HEADER(linux/gfp.h)
diff --git a/firewire/amdtp.c b/firewire/amdtp.c
index 35306fe..f8933f1 100644
--- a/firewire/amdtp.c
+++ b/firewire/amdtp.c
@@ -3,4 +3,7 @@
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 39)
#define fw_iso_context_queue_flush(x)
#endif
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 0)
+#define fw_iso_context_flush_completions(x)
+#endif
#include "../alsa-kernel/firewire/amdtp.c"
diff --git a/i2c/other/tea575x-tuner.c b/i2c/other/tea575x-tuner.c
index 367c068..7c41f90 100644
--- a/i2c/other/tea575x-tuner.c
+++ b/i2c/other/tea575x-tuner.c
@@ -3,5 +3,5 @@
#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 0)
#include "tea575x-tuner-3.3.c"
#else
-#include "../../alsa-kernel/i2c/other/tea575-tuner.c"
+#include "../../alsa-kernel/i2c/other/tea575x-tuner.c"
#endif
diff --git a/include/config.h.in b/include/config.h.in
index d1b7b5a..1ee6246 100644
--- a/include/config.h.in
+++ b/include/config.h.in
@@ -86,6 +86,7 @@
#undef CONFIG_HAVE_GFP_DMA32
#undef CONFIG_HAVE_PAGE_TO_PFN
#undef CONFIG_HAVE_VIDEO_DRVDATA
+#undef CONFIG_HAVE_V4L2_CTRLS
#undef CONFIG_HAVE_GENERATED_AUTOCONF_H
#undef CONFIG_SND_HAVE_PM_QOS_REQUEST
#undef CONFIG_SND_HAVE_PM_QOS_REQUEST_STATIC
diff --git a/pci/hda/hda_auto_parser.c b/pci/hda/hda_auto_parser.c
new file mode 100644
index 0000000..d819393
--- /dev/null
+++ b/pci/hda/hda_auto_parser.c
@@ -0,0 +1,3 @@
+#define __NO_VERSION__
+#include "adriver.h"
+#include "../../alsa-kernel/pci/hda/hda_auto_parser.c"
diff --git a/pci/hda/hda_intel.patch b/pci/hda/hda_intel.patch
index 0f4d297..ac86015 100644
--- a/pci/hda/hda_intel.patch
+++ b/pci/hda/hda_intel.patch
@@ -1,11 +1,11 @@
---- ../../alsa-kernel/pci/hda/hda_intel.c 2011-12-19 10:35:45.000000000 +0100
-+++ hda_intel.c 2011-12-20 07:37:51.000000000 +0100
+--- ../../alsa-kernel/pci/hda/hda_intel.c 2012-05-15 08:47:39.000000000 +0200
++++ hda_intel.c 2012-05-15 12:40:25.000000000 +0200
@@ -1,3 +1,4 @@
-+#include "adriver.h"
++#include "hda_intel_hack.c"
/*
*
* hda_intel.c - Implementation of primary alsa driver code base
-@@ -583,10 +584,21 @@
+@@ -622,10 +623,21 @@
return;
if (addr && size) {
int pages = (size + PAGE_SIZE - 1) >> PAGE_SHIFT;
@@ -27,7 +27,7 @@
}
}
-@@ -2166,7 +2178,11 @@
+@@ -2221,7 +2233,11 @@
struct azx_pcm *apcm = snd_pcm_substream_chip(substream);
struct azx *chip = apcm->chip;
if (!azx_snoop(chip))
@@ -39,7 +39,23 @@
return snd_pcm_lib_default_mmap(substream, area);
}
#else
-@@ -2588,6 +2604,10 @@
+@@ -2665,6 +2681,7 @@
+ static bool __devinit check_hdmi_disabled(struct pci_dev *pci)
+ {
+ bool vga_inactive = false;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0)
+ struct pci_dev *p = get_bound_vga(pci);
+
+ if (p) {
+@@ -2672,6 +2689,7 @@
+ vga_inactive = true;
+ pci_dev_put(p);
+ }
++#endif
+ return vga_inactive;
+ }
+
+@@ -2778,6 +2796,10 @@
}
}
@@ -50,7 +66,7 @@
/*
* white/black-list for enable_msi
*/
-@@ -2600,6 +2620,14 @@
+@@ -2790,6 +2812,14 @@
{}
};
@@ -65,7 +81,7 @@
static void __devinit check_msi(struct azx *chip)
{
const struct snd_pci_quirk *q;
-@@ -2608,7 +2636,11 @@
+@@ -2798,7 +2828,11 @@
chip->msi = !!enable_msi;
return;
}
@@ -77,7 +93,7 @@
q = snd_pci_quirk_lookup(chip->pci, msi_black_list);
if (q) {
printk(KERN_INFO
-@@ -2617,6 +2649,16 @@
+@@ -2807,6 +2841,16 @@
chip->msi = q->value;
return;
}
@@ -94,7 +110,7 @@
/* NVidia chipsets seem to cause troubles with MSI */
if (chip->driver_caps & AZX_DCAPS_NO_MSI) {
-@@ -2638,7 +2680,7 @@
+@@ -2828,7 +2872,7 @@
if (snoop) {
u8 val;
pci_read_config_byte(chip->pci, 0x42, &val);
@@ -103,7 +119,7 @@
snoop = false;
}
break;
-@@ -2761,7 +2803,7 @@
+@@ -2999,7 +3043,7 @@
PCI_DEVICE_ID_ATI_SBX00_SMBUS,
NULL);
if (p_smbus) {
diff --git a/pci/hda/hda_intel_hack.c b/pci/hda/hda_intel_hack.c
new file mode 100644
index 0000000..af67964
--- /dev/null
+++ b/pci/hda/hda_intel_hack.c
@@ -0,0 +1,14 @@
+#include "adriver.h"
+
+/* workaround for the vga-switcheroo audio client handling */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 5, 0)
+#undef CONFIG_VGA_SWITCHEROO
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 34)
+#define vga_switcheroo_unregister_client(pci)
+#endif
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
+#include <linux/pci.h>
+#define pci_get_domain_bus_and_slot(d,b,f) pci_get_bus_and_slot(b,f)
+#endif
+#endif
+
diff --git a/soc/generic/Makefile b/soc/generic/Makefile
new file mode 100644
index 0000000..894734e
--- /dev/null
+++ b/soc/generic/Makefile
@@ -0,0 +1,9 @@
+ifndef SND_TOPDIR
+SND_TOPDIR=..
+endif
+
+include $(SND_TOPDIR)/toplevel.config
+include $(SND_TOPDIR)/Makefile.conf
+
+include $(SND_TOPDIR)/alsa-kernel/soc/generic/Makefile
+include $(SND_TOPDIR)/Rules.make
diff --git a/soc/generic/simple-card.c b/soc/generic/simple-card.c
new file mode 100644
index 0000000..f965103
--- /dev/null
+++ b/soc/generic/simple-card.c
@@ -0,0 +1,2 @@
+#include "adriver.h"
+#include "../../alsa-kernel/soc/generic/simple-card.c"
diff --git a/soc/ux500/Makefile b/soc/ux500/Makefile
new file mode 100644
index 0000000..07bcec7
--- /dev/null
+++ b/soc/ux500/Makefile
@@ -0,0 +1,9 @@
+ifndef SND_TOPDIR
+SND_TOPDIR=..
+endif
+
+include $(SND_TOPDIR)/toplevel.config
+include $(SND_TOPDIR)/Makefile.conf
+
+include $(SND_TOPDIR)/alsa-kernel/soc/ux500/Makefile
+include $(SND_TOPDIR)/Rules.make
diff --git a/soc/ux500/ux500_msp_dai.c b/soc/ux500/ux500_msp_dai.c
new file mode 100644
index 0000000..545dd4c
--- /dev/null
+++ b/soc/ux500/ux500_msp_dai.c
@@ -0,0 +1,2 @@
+#include "adriver.h"
+#include "../../alsa-kernel/soc/generic/ux500_msp_dai.c"
diff --git a/soc/ux500/ux500_msp_i2s.c b/soc/ux500/ux500_msp_i2s.c
new file mode 100644
index 0000000..f758f31
--- /dev/null
+++ b/soc/ux500/ux500_msp_i2s.c
@@ -0,0 +1,2 @@
+#include "adriver.h"
+#include "../../alsa-kernel/soc/generic/ux500_msp_i2s.c"
------- End of patch
hooks/update
---
Git Source Code Management System
hooks/update refs/heads/master \
b54e5c2bb9738f5b641f5119a2de9f4ab81e24c4 \
e0e476a1473f4f6e4ea1186b7579b383f9c22f40
|