November 2010 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH] ALSA: hda: Add Samsung R720 SSID for subwoofer pin fixup
by Daniel Chen 22 Nov '10

22 Nov '10

Hi, Please apply the following patch against current sound-2.6 master HEAD to enable automuting of the subwoofer on the Samsung R720 when headphones are inserted. Thanks, -Dan

2 1

[alsa-devel] [PATCH 3/3] ALSA: HDA: Add Front control for ALC887
by David Henningsson 22 Nov '10

22 Nov '10

HP and Line out share DAC, so we need a switch to turn line out off. Signed-off-by: David Henningsson <david.henningsson(a)canonical.com> -- David Henningsson, Canonical Ltd. http://launchpad.net/~diwic

2 1

[alsa-devel] [PATCH 00/11] Remove unnecessary casts of pci_get_drvdata
by Joe Perches 22 Nov '10

22 Nov '10

Joe Perches (11): drivers/i2c/busses/i2c-nforce2.c: Remove unnecessary casts of pci_get_drvdata drivers/ide/pmac.c: Remove unnecessary casts of pci_get_drvdata drivers/media/dvb/ngene/ngene-core.c: Remove unnecessary casts of pci_get_drvdata drivers/misc/ibmasm/module.c: Remove unnecessary casts of pci_get_drvdata drivers/net/irda: Remove unnecessary casts of pci_get_drvdata drivers/net/s2io.c: Remove unnecessary casts of pci_get_drvdata drivers/net/vxge/vxge-main.c: Remove unnecessary casts of pci_get_drvdata drivers/scsi/be2iscsi/be_main.c: Remove unnecessary casts of pci_get_drvdata drivers/staging: Remove unnecessary casts of pci_get_drvdata drivers/usb/host/uhci-hcd.c: Remove unnecessary casts of pci_get_drvdata sound/pci/asihpi/hpioctl.c: Remove unnecessary casts of pci_get_drvdata drivers/i2c/busses/i2c-nforce2.c | 2 +- drivers/ide/pmac.c | 4 ++-- drivers/media/dvb/ngene/ngene-core.c | 2 +- drivers/misc/ibmasm/module.c | 2 +- drivers/net/irda/donauboe.c | 6 +++--- drivers/net/irda/vlsi_ir.c | 2 +- drivers/net/s2io.c | 3 +-- drivers/net/vxge/vxge-main.c | 28 ++++++++++++---------------- drivers/scsi/be2iscsi/be_main.c | 2 +- drivers/staging/crystalhd/crystalhd_lnx.c | 6 +++--- drivers/staging/et131x/et131x_initpci.c | 2 +- drivers/staging/wlags49_h2/wl_pci.c | 2 +- drivers/usb/host/uhci-hcd.c | 2 +- sound/pci/asihpi/hpioctl.c | 2 +- 14 files changed, 30 insertions(+), 35 deletions(-) -- 1.7.3.1.g432b3.dirty

2 2

[alsa-devel] [PATCH 00/44] remove unnecessary semicolons
by Joe Perches 22 Nov '10

22 Nov '10

ya trivial series... Joe Perches (44): arch/arm: Remove unnecessary semicolons arch/microblaze: Remove unnecessary semicolons arch/um: Remove unnecessary semicolons drivers/cpufreq: Remove unnecessary semicolons drivers/gpio: Remove unnecessary semicolons drivers/i2c: Remove unnecessary semicolons drivers/isdn: Remove unnecessary semicolons drivers/leds: Remove unnecessary semicolons drivers/media/video: Remove unnecessary semicolons drivers/misc: Remove unnecessary semicolons drivers/mmc: Remove unnecessary semicolons drivers/net/bnx2x: Remove unnecessary semicolons drivers/net/e1000e: Remove unnecessary semicolons drivers/net/ixgbe: Remove unnecessary semicolons drivers/net/vxge: Remove unnecessary semicolons drivers/net/wireless/ath: Remove unnecessary semicolons drivers/net/wireless/iwlwifi: Remove unnecessary semicolons drivers/net/cnic.c: Remove unnecessary semicolons drivers/platform/x86: Remove unnecessary semicolons drivers/power: Remove unnecessary semicolons drivers/s390/net: Remove unnecessary semicolons drivers/scsi/be2iscsi: Remove unnecessary semicolons drivers/scsi/bfa: Remove unnecessary semicolons drivers/scsi/lpfc: Remove unnecessary semicolons drivers/scsi/pm8001: Remove unnecessary semicolons drivers/scsi/qla2xxx: Remove unnecessary semicolons drivers/serial: Remove unnecessary semicolons drivers/spi: Remove unnecessary semicolons drivers/staging: Remove unnecessary semicolons drivers/usb/gadget: Remove unnecessary semicolons drivers/xen: Remove unnecessary semicolons fs/9p: Remove unnecessary semicolons fs/ceph: Remove unnecessary semicolons fs/logfs: Remove unnecessary semicolons fs/nfs: Remove unnecessary semicolons fs/ocfs2: Remove unnecessary semicolons fs/ubifs: Remove unnecessary semicolons include/linux/if_macvlan.h: Remove unnecessary semicolons include/net/caif/cfctrl.h: Remove unnecessary semicolons mm/hugetlb.c: Remove unnecessary semicolons net/ipv6/mcast.c: Remove unnecessary semicolons net/sunrpc/addr.c: Remove unnecessary semicolons sound/core/pcm_lib.c: Remove unnecessary semicolons sound/soc/codecs: Remove unnecessary semicolons arch/arm/mach-at91/at91cap9_devices.c | 2 +- arch/arm/mach-at91/at91sam9g45_devices.c | 2 +- arch/arm/mach-at91/at91sam9rl_devices.c | 2 +- arch/arm/mach-nuc93x/time.c | 2 +- arch/arm/mach-tegra/tegra2_clocks.c | 2 +- arch/arm/mach-w90x900/cpu.c | 2 +- arch/arm/plat-mxc/irq.c | 2 +- arch/microblaze/lib/memmove.c | 2 +- arch/um/drivers/mmapper_kern.c | 2 +- drivers/cpufreq/cpufreq_conservative.c | 2 +- drivers/gpio/langwell_gpio.c | 2 +- drivers/i2c/busses/i2c-designware.c | 2 +- drivers/isdn/hardware/mISDN/mISDNinfineon.c | 4 ++-- drivers/isdn/hardware/mISDN/mISDNisar.c | 2 +- drivers/leds/leds-mc13783.c | 2 +- drivers/media/video/cx88/cx88-blackbird.c | 2 +- drivers/media/video/davinci/vpfe_capture.c | 2 +- drivers/media/video/em28xx/em28xx-cards.c | 2 +- drivers/misc/bmp085.c | 2 +- drivers/misc/isl29020.c | 2 +- drivers/mmc/host/davinci_mmc.c | 2 +- drivers/net/bnx2x/bnx2x_link.c | 4 ++-- drivers/net/bnx2x/bnx2x_main.c | 2 +- drivers/net/cnic.c | 2 +- drivers/net/e1000e/netdev.c | 2 +- drivers/net/ixgbe/ixgbe_sriov.c | 2 +- drivers/net/vxge/vxge-main.c | 2 +- drivers/net/wireless/ath/ath9k/htc.h | 2 +- drivers/net/wireless/iwlwifi/iwl-agn.c | 2 +- drivers/platform/x86/classmate-laptop.c | 2 +- drivers/platform/x86/thinkpad_acpi.c | 2 +- drivers/power/intel_mid_battery.c | 2 +- drivers/s390/net/qeth_core_sys.c | 2 +- drivers/scsi/be2iscsi/be_main.c | 4 ++-- drivers/scsi/bfa/bfa_fcs_lport.c | 2 +- drivers/scsi/lpfc/lpfc_bsg.c | 2 +- drivers/scsi/pm8001/pm8001_init.c | 2 +- drivers/scsi/qla2xxx/qla_isr.c | 4 ++-- drivers/scsi/qla2xxx/qla_nx.c | 2 +- drivers/serial/mrst_max3110.c | 2 +- drivers/spi/amba-pl022.c | 2 +- drivers/spi/spi_nuc900.c | 2 +- .../staging/ath6kl/hif/sdio/linux_sdio/src/hif.c | 2 +- drivers/staging/ath6kl/os/linux/ar6000_drv.c | 2 +- drivers/staging/bcm/InterfaceInit.c | 2 +- drivers/staging/bcm/InterfaceIsr.c | 2 +- drivers/staging/bcm/Misc.c | 4 ++-- .../comedi/drivers/addi-data/APCI1710_Tor.c | 2 +- .../comedi/drivers/addi-data/hwdrv_apci1500.c | 2 +- .../comedi/drivers/addi-data/hwdrv_apci1516.c | 2 +- .../comedi/drivers/addi-data/hwdrv_apci3501.c | 2 +- drivers/staging/comedi/drivers/amplc_pci230.c | 2 +- drivers/staging/comedi/drivers/cb_das16_cs.c | 2 +- drivers/staging/comedi/drivers/comedi_bond.c | 2 +- drivers/staging/crystalhd/crystalhd_hw.c | 2 +- drivers/staging/go7007/go7007-driver.c | 2 +- drivers/staging/iio/accel/lis3l02dq_ring.c | 2 +- .../staging/intel_sst/intel_sst_drv_interface.c | 4 ++-- drivers/staging/keucr/smilmain.c | 4 ++-- drivers/staging/keucr/smilsub.c | 4 ++-- drivers/staging/msm/lcdc_toshiba_wvga_pt.c | 2 +- drivers/staging/rt2860/common/cmm_data_pci.c | 4 ++-- drivers/staging/rt2860/rt_linux.c | 2 +- drivers/staging/rt2860/rtmp.h | 2 +- drivers/staging/rtl8192e/ieee80211/ieee80211_tx.c | 2 +- drivers/staging/rtl8192e/r819xE_phy.c | 2 +- drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c | 2 +- drivers/staging/rtl8192u/r8192U_core.c | 2 +- drivers/staging/rtl8192u/r819xU_phy.c | 2 +- drivers/staging/rtl8712/rtl8712_efuse.c | 2 +- drivers/staging/rtl8712/rtl8712_xmit.c | 2 +- drivers/staging/rtl8712/rtl871x_xmit.c | 2 +- drivers/staging/tidspbridge/core/tiomap3430.c | 4 ++-- drivers/staging/tidspbridge/rmgr/nldr.c | 2 +- drivers/staging/vt6655/card.c | 2 +- drivers/staging/vt6655/iwctl.c | 2 +- drivers/staging/vt6655/wpa2.c | 4 ++-- drivers/staging/vt6656/baseband.c | 2 +- drivers/staging/vt6656/iwctl.c | 2 +- drivers/staging/vt6656/power.c | 2 +- drivers/staging/vt6656/wpa2.c | 4 ++-- drivers/usb/gadget/f_fs.c | 2 +- drivers/xen/swiotlb-xen.c | 2 +- fs/9p/acl.c | 2 +- fs/9p/xattr.c | 2 +- fs/ceph/mds_client.c | 2 +- fs/logfs/readwrite.c | 2 +- fs/nfs/getroot.c | 2 +- fs/ocfs2/refcounttree.c | 2 +- fs/ubifs/scan.c | 2 +- include/linux/if_macvlan.h | 2 +- include/net/caif/cfctrl.h | 2 +- mm/hugetlb.c | 2 +- net/ipv6/mcast.c | 2 +- net/sunrpc/addr.c | 2 +- sound/core/pcm_lib.c | 2 +- sound/soc/codecs/wm8904.c | 2 +- sound/soc/codecs/wm8940.c | 1 - sound/soc/codecs/wm8993.c | 2 +- sound/soc/codecs/wm_hubs.c | 2 +- 100 files changed, 111 insertions(+), 112 deletions(-) -- 1.7.3.1.g432b3.dirty

9 37

Re: [alsa-devel] [PATCH 14/14] sound/ppc: Use printf extension %pR for struct resource
by Takashi Iwai 22 Nov '10

22 Nov '10

At Fri, 12 Nov 2010 13:38:04 -0800, Joe Perches wrote: > > Using %pR standardizes the struct resource output. > > Signed-off-by: Joe Perches <joe(a)perches.com> Applied now. Thanks. Takashi > --- > sound/ppc/pmac.c | 12 ++++-------- > 1 files changed, 4 insertions(+), 8 deletions(-) > > diff --git a/sound/ppc/pmac.c b/sound/ppc/pmac.c > index 8508117..b47cfd4 100644 > --- a/sound/ppc/pmac.c > +++ b/sound/ppc/pmac.c > @@ -1228,10 +1228,8 @@ int __devinit snd_pmac_new(struct snd_card *card, struct snd_pmac **chip_return) > chip->rsrc[i].start + 1, > rnames[i]) == NULL) { > printk(KERN_ERR "snd: can't request rsrc " > - " %d (%s: 0x%016llx:%016llx)\n", > - i, rnames[i], > - (unsigned long long)chip->rsrc[i].start, > - (unsigned long long)chip->rsrc[i].end); > + " %d (%s: %pR)\n", > + i, rnames[i], &chip->rsrc[i]); > err = -ENODEV; > goto __error; > } > @@ -1256,10 +1254,8 @@ int __devinit snd_pmac_new(struct snd_card *card, struct snd_pmac **chip_return) > chip->rsrc[i].start + 1, > rnames[i]) == NULL) { > printk(KERN_ERR "snd: can't request rsrc " > - " %d (%s: 0x%016llx:%016llx)\n", > - i, rnames[i], > - (unsigned long long)chip->rsrc[i].start, > - (unsigned long long)chip->rsrc[i].end); > + " %d (%s: %pR)\n", > + i, rnames[i], &chip->rsrc[i]); > err = -ENODEV; > goto __error; > } > -- > 1.7.3.1.g432b3.dirty >

1 0

[alsa-devel] [PATCH] ALSA: ac97: Apply quirk for Dell Latitude D610 binding Master and Headphone controls
by David Henningsson 22 Nov '10

22 Nov '10

BugLink: https://launchpad.net/bugs/669279 The original reporter states: "The Master mixer does not change the volume from the headphone output (which is affected by the headphone mixer). Instead it only seems to control the on-board speaker volume. This confuses PulseAudio greatly as the Master channel is merged into the volume mix." Fix this symptom by applying the hp_only quirk for the reporter's SSID. The fix is applicable to all stable kernels. Reported-and-tested-by: Ben Gamari <bgamari(a)gmail.com> Cc: <stable(a)kernel.org> [2.6.32+] Signed-off-by: Daniel T Chen <crimsun(a)ubuntu.com> Signed-off-by: David Henningsson <david.henningsson(a)canonical.com> -- David Henningsson, Canonical Ltd. http://launchpad.net/~diwic

2 1

[alsa-devel] [PATCH] jack: use eventfd which never blocks.
by Torben Hohn 21 Nov '10

21 Nov '10

the use of the socketpair for synchronisation is not correct. jack does not allow blocking calls in the process_callback, the socket buffers are quite small, and seem to overflow under some conditions. the result was write(2) blocking, and jack kicking the client. (jack needs to be running in RT mode, with a pretty low period size (<=128) but this really is the normal usecase) this patch uses eventfd(2) when its available to mitigate the problem. Signed-off-by: Torben Hohn <torbenh(a)gmx.de> --- configure.in | 5 +++++ jack/pcm_jack.c | 30 +++++++++++++++++++++++++++--- 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/configure.in b/configure.in index 5d71cae..9fa7f27 100644 --- a/configure.in +++ b/configure.in @@ -21,6 +21,11 @@ AC_CHECK_LIB(asound, snd_pcm_ioplug_create,, AC_ARG_ENABLE([jack], AS_HELP_STRING([--disable-jack], [Disable building of JACK plugin])) +AC_CHECK_HEADER([sys/eventfd.h], [HAVE_EVENTFD=yes], [HAVE_EVENTFD=no]) +if test "$HAVE_EVENTFD" = "yes"; then + AC_DEFINE(HAVE_EVENTFD, 1,"eventfd is available") +fi + if test "x$enable_jack" != "xno"; then PKG_CHECK_MODULES(JACK, jack >= 0.98, [HAVE_JACK=yes], [HAVE_JACK=no]) fi diff --git a/jack/pcm_jack.c b/jack/pcm_jack.c index 3370a26..83ac56a 100644 --- a/jack/pcm_jack.c +++ b/jack/pcm_jack.c @@ -20,6 +20,8 @@ * */ +#include "config.h" + #include <byteswap.h> #include <sys/shm.h> #include <sys/types.h> @@ -28,6 +30,10 @@ #include <alsa/asoundlib.h> #include <alsa/pcm_external.h> +#ifdef HAVE_EVENTFD +#include <sys/eventfd.h> +#endif + typedef enum _jack_format { SND_PCM_JACK_FORMAT_RAW } snd_pcm_jack_format_t; @@ -63,8 +69,10 @@ static void snd_pcm_jack_free(snd_pcm_jack_t *jack) } if (jack->fd >= 0) close(jack->fd); +#ifndef HAVE_EVENTFD if (jack->io.poll_fd >= 0) close(jack->io.poll_fd); +#endif free(jack->areas); free(jack); } @@ -81,11 +89,19 @@ static int snd_pcm_jack_poll_revents(snd_pcm_ioplug_t *io ATTRIBUTE_UNUSED, struct pollfd *pfds, unsigned int nfds, unsigned short *revents) { +#ifdef HAVE_EVENTFD + eventfd_t buf[1]; +#else static char buf[1]; - +#endif + assert(pfds && nfds == 1 && revents); - read(pfds[0].fd, buf, 1); + read(pfds[0].fd, buf, sizeof(buf)); +#ifdef HAVE_EVENTFD + buf[0] -= 1; + write(pfds[0].fd, buf, sizeof(buf)); +#endif *revents = pfds[0].revents; return 0; @@ -103,7 +119,11 @@ snd_pcm_jack_process_cb(jack_nframes_t nframes, snd_pcm_ioplug_t *io) snd_pcm_jack_t *jack = io->private_data; const snd_pcm_channel_area_t *areas; snd_pcm_uframes_t xfer = 0; +#ifdef HAVE_EVENTFD + static eventfd_t buf[1] = { 0x00000001 }; +#else static char buf[1]; +#endif unsigned int channel; for (channel = 0; channel < io->channels; channel++) { @@ -143,7 +163,7 @@ snd_pcm_jack_process_cb(jack_nframes_t nframes, snd_pcm_ioplug_t *io) xfer += frames; } - write(jack->fd, buf, 1); /* for polling */ + write(jack->fd, buf, sizeof(buf)); /* for polling */ return 0; } @@ -361,7 +381,11 @@ static int snd_pcm_jack_open(snd_pcm_t **pcmp, const char *name, return -ENOMEM; } +#ifdef HAVE_EVENTFD + fd[0] = fd[1] = eventfd(0, 0); +#else socketpair(AF_LOCAL, SOCK_STREAM, 0, fd); +#endif jack->fd = fd[0]; -- 1.7.1

2 1

[alsa-devel] Dubious assertion in alsa-lib
by Alexander E. Patrakov 21 Nov '10

21 Nov '10

Hello. In alsa-lib-1.0.23/src/pcm/pcm_plug.c, there are two assertions of the form: assert(snd_pcm_format_linear(slv->format)); in snd_pcm_plug_change_rate() and snd_pcm_plug_change_channels() functions, respectively. While in snd_pcm_plug_change_rate() this looks reasonable, it is IMHO invalid in snd_pcm_plug_change_channels(). I say this because this can be triggered with the following .asoundrc: pcm.jackplug { type plug slave.pcm { type jack playback_ports { 0 system:playback_1 1 system:playback_2 } capture_ports { 0 system:capture_1 1 system:capture_2 } client_name "alsa" } } and the following command: aplay -r 44100 -c 1 -f FLOAT_LE -D jackplug /dev/zero JACK is configured to accept stereo audio, with 44100 Hz sampling rate, so only the number of channels has to be changed by the plug here. I.e., rerouting channels by copying samples makes perfect sense not only for linear formats, but also for floating-point ones. -- Alexander E. Patrakov

1 0

[alsa-devel] [PATCH 0/3] ASoC: add support for audio on iPaq hx4700
by Dmitry Artamonow 20 Nov '10

20 Nov '10

Here's three patches adding support for audio on iPaq hx4700 PDA. AK4641 codec driver was originally written by Harald Welte for gnufiish project [1], then Philipp Zabel adapted it to use on hx4700. I picked Philipp's patches from his git repository[2], updated them to current kernel and also fixed all the issues I've met while using these patches on my hx4700 device. So now I would like to submit these patches for review in hope they could be included in 2.6.38. This patchset is based on linux-next-20101119 [1] http://gnufiish.org [2] http://git.linuxtogo.org/?p=ph5/kernel.git;a=summary Dmitry Artamonow (2): ASoC: Asahi Kasei AK4641 codec driver ASoC: add iPAQ hx4700 machine driver Philipp Zabel (1): pxa/hx4700: add I2C board info for AK4641 codec arch/arm/mach-pxa/hx4700.c | 18 + arch/arm/mach-pxa/include/mach/hx4700.h | 4 +- include/sound/ak4641.h | 26 ++ sound/soc/codecs/Kconfig | 4 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/ak4641.c | 628 +++++++++++++++++++++++++++++++ sound/soc/codecs/ak4641.h | 47 +++ sound/soc/pxa/Kconfig | 9 + sound/soc/pxa/Makefile | 2 + sound/soc/pxa/hx4700.c | 253 +++++++++++++ 10 files changed, 991 insertions(+), 2 deletions(-) create mode 100644 include/sound/ak4641.h create mode 100644 sound/soc/codecs/ak4641.c create mode 100644 sound/soc/codecs/ak4641.h create mode 100644 sound/soc/pxa/hx4700.c

3 6

[alsa-devel] alsa jack plugin
by torbenh 19 Nov '10

19 Nov '10

the alsa jack plugin has quite some problems: a) does not work correctly with mplayers alsa output. (and quite a few others) b) it includes the pid in its clientname. c) it requires port connections. d) jack client is deactivated when alsa stream is not active. e) no way to set the jack clientname the master branch on git://hochstrom.endofinternet.org/alsa-plugins carries fixes for a, b and e. c and d have their own branches. i have seen a few problems with making the write end of the fd non-blocking. would it be possible to use eventfd(2) for this ? -- torben Hohn

3 5