January 2009 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH] snd-aoa: handle master-amp if present
by Johannes Berg 15 Jan '09

15 Jan '09

Some machines have a master amp GPIO that needs to be toggled to get sound output, in addition to speaker/headphone/line-out amps. This makes snd-aoa handle it, if present in the device tree, thus making snd-aoa be able to output sound on PowerMac3,6, which was previously handled by snd-powermac which also doesn't use the master amp GPIO. Signed-off-by: Johannes Berg <johannes(a)sipsolutions.net> --- sound/aoa/aoa-gpio.h | 2 ++ sound/aoa/core/gpio-feature.c | 17 ++++++++++++++++- sound/aoa/fabrics/layout.c | 7 +++++++ 3 files changed, 25 insertions(+), 1 deletion(-) --- wireless-testing.orig/sound/aoa/aoa-gpio.h 2009-01-15 18:09:48.000000000 +0100 +++ wireless-testing/sound/aoa/aoa-gpio.h 2009-01-15 18:15:47.000000000 +0100 @@ -34,10 +34,12 @@ struct gpio_methods { void (*set_headphone)(struct gpio_runtime *rt, int on); void (*set_speakers)(struct gpio_runtime *rt, int on); void (*set_lineout)(struct gpio_runtime *rt, int on); + void (*set_master)(struct gpio_runtime *rt, int on); int (*get_headphone)(struct gpio_runtime *rt); int (*get_speakers)(struct gpio_runtime *rt); int (*get_lineout)(struct gpio_runtime *rt); + int (*get_master)(struct gpio_runtime *rt); void (*set_hw_reset)(struct gpio_runtime *rt, int on); --- wireless-testing.orig/sound/aoa/core/gpio-feature.c 2009-01-15 18:09:48.000000000 +0100 +++ wireless-testing/sound/aoa/core/gpio-feature.c 2009-01-15 18:18:09.000000000 +0100 @@ -14,7 +14,7 @@ #include <linux/interrupt.h> #include "../aoa.h" -/* TODO: these are 20 global variables +/* TODO: these are lots of global variables * that aren't used on most machines... * Move them into a dynamically allocated * structure and use that. @@ -23,6 +23,7 @@ /* these are the GPIO numbers (register addresses as offsets into * the GPIO space) */ static int headphone_mute_gpio; +static int master_mute_gpio; static int amp_mute_gpio; static int lineout_mute_gpio; static int hw_reset_gpio; @@ -32,6 +33,7 @@ static int linein_detect_gpio; /* see the SWITCH_GPIO macro */ static int headphone_mute_gpio_activestate; +static int master_mute_gpio_activestate; static int amp_mute_gpio_activestate; static int lineout_mute_gpio_activestate; static int hw_reset_gpio_activestate; @@ -156,6 +158,7 @@ static int ftr_gpio_get_##name(struct gp FTR_GPIO(headphone, 0); FTR_GPIO(amp, 1); FTR_GPIO(lineout, 2); +FTR_GPIO(master, 3); static void ftr_gpio_set_hw_reset(struct gpio_runtime *rt, int on) { @@ -172,6 +175,8 @@ static void ftr_gpio_set_hw_reset(struct hw_reset_gpio, v); } +static struct gpio_methods methods; + static void ftr_gpio_all_amps_off(struct gpio_runtime *rt) { int saved; @@ -181,6 +186,8 @@ static void ftr_gpio_all_amps_off(struct ftr_gpio_set_headphone(rt, 0); ftr_gpio_set_amp(rt, 0); ftr_gpio_set_lineout(rt, 0); + if (methods.set_master) + ftr_gpio_set_master(rt, 0); rt->implementation_private = saved; } @@ -193,6 +200,8 @@ static void ftr_gpio_all_amps_restore(st ftr_gpio_set_headphone(rt, (s>>0)&1); ftr_gpio_set_amp(rt, (s>>1)&1); ftr_gpio_set_lineout(rt, (s>>2)&1); + if (methods.set_master) + ftr_gpio_set_master(rt, (s>>3)&1); } static void ftr_handle_notify(struct work_struct *work) @@ -231,6 +240,12 @@ static void ftr_gpio_init(struct gpio_ru get_gpio("hw-reset", "audio-hw-reset", &hw_reset_gpio, &hw_reset_gpio_activestate); + if (get_gpio("master-mute", NULL, + &master_mute_gpio, + &master_mute_gpio_activestate)) { + methods.set_master = ftr_gpio_set_master; + methods.get_master = ftr_gpio_get_master; + } headphone_detect_node = get_gpio("headphone-detect", NULL, &headphone_detect_gpio, --- wireless-testing.orig/sound/aoa/fabrics/layout.c 2009-01-15 18:15:28.000000000 +0100 +++ wireless-testing/sound/aoa/fabrics/layout.c 2009-01-15 18:15:47.000000000 +0100 @@ -600,6 +600,7 @@ struct layout_dev { struct snd_kcontrol *headphone_ctrl; struct snd_kcontrol *lineout_ctrl; struct snd_kcontrol *speaker_ctrl; + struct snd_kcontrol *master_ctrl; struct snd_kcontrol *headphone_detected_ctrl; struct snd_kcontrol *lineout_detected_ctrl; @@ -651,6 +652,7 @@ static struct snd_kcontrol_new n##_ctl = AMP_CONTROL(headphone, "Headphone Switch"); AMP_CONTROL(speakers, "Speakers Switch"); AMP_CONTROL(lineout, "Line-Out Switch"); +AMP_CONTROL(master, "Master Switch"); static int detect_choice_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) @@ -891,6 +893,11 @@ static void layout_attached_codec(struct lineout = codec->gpio->methods->get_detect(codec->gpio, AOA_NOTIFY_LINE_OUT); + if (codec->gpio->methods->set_master) { + ctl = snd_ctl_new1(&master_ctl, codec->gpio); + ldev->master_ctrl = ctl; + aoa_snd_ctl_add(ctl); + } while (cc->connected) { if (cc->connected & CC_SPEAKERS) { if (headphones <= 0 && lineout <= 0)

1 0

[alsa-devel] Mac Pro problem with USB soundcard
by James Ward 15 Jan '09

15 Jan '09

I'm running 64 Bit Sabayon Linux 4.0 r1 on a Mac Pro. I have connected a Creative USB sound card and would like to use it as the default. I tried these two .asoundrc files suggested by gnubien on #alsa: pcm.!default { type hw card 1 } ctl.!default { type hw card 1 } and: created by wishie on #alsa 10-13-07 #Set the card you want to use here.. this example is for hw:1,0 pcm.snd_card { type hw card 1 #change "card 1" to the card number listed for your usb soundcard using cat /proc/asound/cards output device 0 } pcm.!default { type plug slave.pcm "dmixer" } pcm.dmixer { type dmix ipc_key 1024 ipc_key_add_uid false ipc_perm 0660 slave { pcm "snd_card" rate 48000 period_time 0 period_size 1024 buffer_time 0 buffer_size 5120 } } Either of these .asoundrc files result in the USB soundcard going away. I have to unplug it and plug it back in to get it back. Please help. James -- Ward... James Ward Linux System Administrator System Administration Phone: 520-290-0910 ext 268 Fax: 520-546-3442 ICQ: 201663408 Jabber: james(a)jabber.chinoc.net

1 0

[alsa-devel] RFC: snd_card_create() function
by Takashi Iwai 15 Jan '09

15 Jan '09

Hi, so far, we use snd_card_new() function to create a card instance. A known problem regarding this API is that it doesn't return a proper error code, thus the probe callback always returns -ENOMEM (or whatever the driver defines) no matter which error occurred actually. A typical case is the card slot conflict. Even in such a case, it returns -ENOMEM, which may mislead the user. For fixing this situation, I'd like to convert from snd_card_new() to a new function, snd_card_create(): int snd_card_create(int idx, const char *id, struct module *module, int extra_size, struct snd_card **card_ret); and provides snd_card_new() as a wrapper with deprecated flag: static inline __deprecated struct snd_card *snd_card_new(int idx, const char *id, struct module *module, int extra_size) { struct snd_card *card; if (snd_card_create(idx, id, module, extra_size, &card) < 0) return NULL; return card; } The merit of creating a new function is that the older and out-of-tree codes (like xfi) work without modification. There is alternative option, namely to use PTR_ERR() and keep the function as is. But this has no advantage in practice -- it can't detect the old API at build time, and it may Oops. The preliminary patches are found in test/snd_card_new-err branch of sound git tree: git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git test/snd_card_new-err If anyone finds problems with this, please let me know. thanks, Takashi

4 9

[alsa-devel] usb-audio extension unit
by James Courtier-Dutton 15 Jan '09

15 Jan '09

Hi, Is there any chance that someone could add get/set functions for usb audio "extension units". This would make adding support for usb devices such as the emu usb products a lot easier to do. Kind Regards James

2 1

[alsa-devel] [PATCH 0/1] ASoC: fix the dapm_mux_update_power function for value_mux
by Peter Ujfalusi 15 Jan '09

15 Jan '09

Hello, To be honest I don't know how I have missed this from the previous series with the cleanup for the value_mux type. the dapm_mux_update_power function needs to check for both snd_soc_dapm_mux and snd_soc_dapm_value_mux. --- Peter Ujfalusi (1): ASoC: Fix the power update function for snd_soc_dapm_value_mux sound/soc/soc-dapm.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)

2 2

Re: [alsa-devel] [Fwd: Re: Fwd: audio ovolume problem on powerbook G3 Lombard (PPC740)]
by Risto Suominen 15 Jan '09

15 Jan '09

2009/1/8 Takashi Iwai <tiwai(a)suse.de>: > At Thu, 8 Jan 2009 14:06:05 +0200, > Risto Suominen wrote: >> >> 2009/1/8, Takashi Iwai <tiwai(a)suse.de>: >> > >> > We may use a virtual master control when all slave controls have the >> > identical volume resolution. >> > >> >> Sounds good. Is it something configurable, so there is no need to >> change the code? > > Look at sound/core/vmaster.c. > > > Takashi > Ok, I've tried to implement this on snd-powermac. Takashi, looks like there is a side effect: plugging in headphone doesn't show on alsamixer, even though it works, i.e. the speaker is silenced. Or have I forgotten something in my implementation? http://ristosu.wippiespace.com/pub/alsa-awacs-1.0.18a-p13.diff Richard, maybe you can try this? You should adjust Speaker and Line out to 100% in order to have full scale in Master. Risto

2 3

[alsa-devel] lockdep warning on 2.6.29-rc1 with pulseaudio
by Johannes Berg 14 Jan '09

14 Jan '09

Sorry if you've seen this already, I couldn't find it on gmane. soemthing is doing mutex_lock(&pcm->open_mutex); but this lock depends on &chip->open_mutex which in turn depends on &codec->spdif_mutex (seems a little odd) and that already depends on mmap_sem, through might_fault()? [ 49.742444] ======================================================= [ 49.742449] [ INFO: possible circular locking dependency detected ] [ 49.742453] 2.6.29-rc1-wl-11361-g269245b-dirty #15 [ 49.742455] ------------------------------------------------------- [ 49.742458] pulseaudio/3550 is trying to acquire lock: [ 49.742461] (&pcm->open_mutex){--..}, at: [<ffffffffa059f86e>] snd_pcm_release+0x3e/0xb0 [snd_pcm] [ 49.742479] [ 49.742479] but task is already holding lock: [ 49.742482] (&mm->mmap_sem){----}, at: [<ffffffff802c4a42>] sys_munmap+0x42/0x80 [ 49.742493] [ 49.742493] which lock already depends on the new lock. [ 49.742494] [ 49.742497] [ 49.742497] the existing dependency chain (in reverse order) is: [ 49.742500] [ 49.742501] -> #3 (&mm->mmap_sem){----}: [ 49.742507] [<ffffffff80273427>] check_prev_add+0x3b7/0x770 [ 49.742513] [<ffffffff80273de6>] validate_chain+0x606/0x6c0 [ 49.742518] [<ffffffff802742df>] __lock_acquire+0x43f/0xa10 [ 49.742522] [<ffffffff80274941>] lock_acquire+0x91/0xc0 [ 49.742526] [<ffffffff802bc39f>] might_fault+0x7f/0xb0 [ 49.742532] [<ffffffffa07fb15d>] snd_hda_mixer_amp_tlv+0x6d/0xf0 [snd_hda_codec] [ 49.742544] [<ffffffffa0b20bb0>] alc_cap_vol_tlv+0x70/0xa0 [snd_hda_codec_realtek] [ 49.742557] [<ffffffffa03a30be>] snd_ctl_tlv_ioctl+0x14e/0x1d0 [snd] [ 49.742571] [<ffffffffa03a527b>] snd_ctl_ioctl+0x26b/0x540 [snd] [ 49.742581] [<ffffffff802e82d1>] vfs_ioctl+0x31/0xa0 [ 49.742587] [<ffffffff802e8699>] do_vfs_ioctl+0x89/0x350 [ 49.742592] [<ffffffff802e89aa>] sys_ioctl+0x4a/0x80 [ 49.742597] [<ffffffff8020bd1b>] system_call_fastpath+0x16/0x1b [ 49.742603] [<ffffffffffffffff>] 0xffffffffffffffff [ 49.742608] [ 49.742609] -> #2 (&codec->spdif_mutex){--..}: [ 49.742615] [<ffffffff80273427>] check_prev_add+0x3b7/0x770 [ 49.742619] [<ffffffff80273de6>] validate_chain+0x606/0x6c0 [ 49.742623] [<ffffffff802742df>] __lock_acquire+0x43f/0xa10 [ 49.742628] [<ffffffff80274941>] lock_acquire+0x91/0xc0 [ 49.742632] [<ffffffff805ac5fc>] mutex_lock_nested+0xec/0x380 [ 49.742639] [<ffffffffa07f8d54>] snd_hda_multi_out_analog_open+0x84/0x130 [snd_hda_codec] [ 49.742649] [<ffffffffa0b1ac60>] alc880_playback_pcm_open+0x20/0x30 [snd_hda_codec_realtek] [ 49.742659] [<ffffffffa0897f39>] azx_pcm_open+0x209/0x280 [snd_hda_intel] [ 49.742667] [<ffffffffa05a01b8>] snd_pcm_open_substream+0x58/0xa0 [snd_pcm] [ 49.742677] [<ffffffffa05a038b>] snd_pcm_open+0x18b/0x280 [snd_pcm] [ 49.742687] [<ffffffffa05a04ec>] snd_pcm_playback_open+0x2c/0x40 [snd_pcm] [ 49.742697] [<ffffffffa039f7fc>] __snd_open+0x14c/0x270 [snd] [ 49.742707] [<ffffffffa039f947>] snd_open+0x27/0x40 [snd] [ 49.742717] [<ffffffff802dcd47>] chrdev_open+0x137/0x210 [ 49.742722] [<ffffffff802d7a5a>] __dentry_open+0x10a/0x340 [ 49.742727] [<ffffffff802d7d97>] nameidata_to_filp+0x57/0x70 [ 49.742732] [<ffffffff802e69de>] do_filp_open+0x1fe/0x970 [ 49.742737] [<ffffffff802d7868>] do_sys_open+0x78/0x110 [ 49.742742] [<ffffffff802d792b>] sys_open+0x1b/0x20 [ 49.742746] [<ffffffff8020bd1b>] system_call_fastpath+0x16/0x1b [ 49.742751] [<ffffffffffffffff>] 0xffffffffffffffff [ 49.742756] [ 49.742756] -> #1 (&chip->open_mutex){--..}: [ 49.742762] [<ffffffff80273427>] check_prev_add+0x3b7/0x770 [ 49.742767] [<ffffffff80273de6>] validate_chain+0x606/0x6c0 [ 49.742771] [<ffffffff802742df>] __lock_acquire+0x43f/0xa10 [ 49.742775] [<ffffffff80274941>] lock_acquire+0x91/0xc0 [ 49.742780] [<ffffffff805ac5fc>] mutex_lock_nested+0xec/0x380 [ 49.742785] [<ffffffffa0897d78>] azx_pcm_open+0x48/0x280 [snd_hda_intel] [ 49.742792] [<ffffffffa05a01b8>] snd_pcm_open_substream+0x58/0xa0 [snd_pcm] [ 49.742802] [<ffffffffa05a038b>] snd_pcm_open+0x18b/0x280 [snd_pcm] [ 49.742812] [<ffffffffa05a04ec>] snd_pcm_playback_open+0x2c/0x40 [snd_pcm] [ 49.742822] [<ffffffffa039f7fc>] __snd_open+0x14c/0x270 [snd] [ 49.742832] [<ffffffffa039f947>] snd_open+0x27/0x40 [snd] [ 49.742841] [<ffffffff802dcd47>] chrdev_open+0x137/0x210 [ 49.742846] [<ffffffff802d7a5a>] __dentry_open+0x10a/0x340 [ 49.742850] [<ffffffff802d7d97>] nameidata_to_filp+0x57/0x70 [ 49.742855] [<ffffffff802e69de>] do_filp_open+0x1fe/0x970 [ 49.742860] [<ffffffff802d7868>] do_sys_open+0x78/0x110 [ 49.742864] [<ffffffff802d792b>] sys_open+0x1b/0x20 [ 49.742869] [<ffffffff8020bd1b>] system_call_fastpath+0x16/0x1b [ 49.742874] [<ffffffffffffffff>] 0xffffffffffffffff [ 49.742882] [ 49.742883] -> #0 (&pcm->open_mutex){--..}: [ 49.742889] [<ffffffff802730c7>] check_prev_add+0x57/0x770 [ 49.742893] [<ffffffff80273de6>] validate_chain+0x606/0x6c0 [ 49.742897] [<ffffffff802742df>] __lock_acquire+0x43f/0xa10 [ 49.742902] [<ffffffff80274941>] lock_acquire+0x91/0xc0 [ 49.742906] [<ffffffff805ac5fc>] mutex_lock_nested+0xec/0x380 [ 49.742911] [<ffffffffa059f86e>] snd_pcm_release+0x3e/0xb0 [snd_pcm] [ 49.742921] [<ffffffff802dae20>] __fput+0xd0/0x1e0 [ 49.742926] [<ffffffff802daf4d>] fput+0x1d/0x30 [ 49.742931] [<ffffffff802c377a>] remove_vma+0x4a/0x80 [ 49.742936] [<ffffffff802c49b2>] do_munmap+0x342/0x390 [ 49.742940] [<ffffffff802c4a50>] sys_munmap+0x50/0x80 [ 49.742944] [<ffffffff8020bd1b>] system_call_fastpath+0x16/0x1b [ 49.742949] [<ffffffffffffffff>] 0xffffffffffffffff [ 49.742954] [ 49.742954] other info that might help us debug this: [ 49.742955] [ 49.742958] 1 lock held by pulseaudio/3550: [ 49.742961] #0: (&mm->mmap_sem){----}, at: [<ffffffff802c4a42>] sys_munmap+0x42/0x80 [ 49.742969] [ 49.742970] stack backtrace: [ 49.742973] Pid: 3550, comm: pulseaudio Not tainted 2.6.29-rc1-wl-11361-g269245b-dirty #15 [ 49.742976] Call Trace: [ 49.742981] [<ffffffff80272b70>] print_circular_bug_tail+0xe0/0xf0 [ 49.742985] [<ffffffff802730c7>] check_prev_add+0x57/0x770 [ 49.742991] [<ffffffff8026f414>] ? get_lock_stats+0x34/0x70 [ 49.742995] [<ffffffff80273de6>] validate_chain+0x606/0x6c0 [ 49.742998] [<ffffffff802742df>] __lock_acquire+0x43f/0xa10 [ 49.743002] [<ffffffff80274941>] lock_acquire+0x91/0xc0 [ 49.743012] [<ffffffffa059f86e>] ? snd_pcm_release+0x3e/0xb0 [snd_pcm] [ 49.743017] [<ffffffff805ac5fc>] mutex_lock_nested+0xec/0x380 [ 49.743027] [<ffffffffa059f86e>] ? snd_pcm_release+0x3e/0xb0 [snd_pcm] [ 49.743036] [<ffffffffa059f86e>] ? snd_pcm_release+0x3e/0xb0 [snd_pcm] [ 49.743046] [<ffffffffa059f86e>] snd_pcm_release+0x3e/0xb0 [snd_pcm] [ 49.743051] [<ffffffff802dae20>] __fput+0xd0/0x1e0 [ 49.743055] [<ffffffff802daf4d>] fput+0x1d/0x30 [ 49.743059] [<ffffffff802c377a>] remove_vma+0x4a/0x80 [ 49.743063] [<ffffffff802c49b2>] do_munmap+0x342/0x390 [ 49.743067] [<ffffffff802c4a50>] sys_munmap+0x50/0x80 [ 49.743071] [<ffffffff8020bd1b>] system_call_fastpath+0x16/0x1b Incidentally, sound doesn't work on my macbook5,1, I get lots of controls but no output. johannes

2 13

[alsa-devel] [PATCH] hda: fixed invalid value for SND_PCI_QUIRK
by Matthew Ranostay 14 Jan '09

14 Jan '09

Changed invalid STAC_92HD71BXX_REF value for reference board SND_PCI_QUIRK to correct STAC_92HD83XXX_REF. Signed-off-by: Matthew Ranostay <mranostay(a)embeddedalley.com> --- diff --git a/pci/hda/patch_sigmatel.c b/pci/hda/patch_sigmatel.c index 35b83dc..a4e2d8f 100644 --- a/pci/hda/patch_sigmatel.c +++ b/pci/hda/patch_sigmatel.c @@ -1682,7 +1682,7 @@ static const char *stac92hd83xxx_models[STAC_92HD83XXX_MODELS] = { static struct snd_pci_quirk stac92hd83xxx_cfg_tbl[] = { /* SigmaTel reference board */ SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2668, - "DFI LanParty", STAC_92HD71BXX_REF), + "DFI LanParty", STAC_92HD83XXX_REF), {} /* terminator */ };

2 1

[alsa-devel] Creative X-Fi not recognized since 1/9 build
by Susan Cragin 14 Jan '09

14 Jan '09

This is FYI. I have a creative X-fi soundcard and have been compiling developer builds for a couple of weeks, mostly with great success. But as of the 1/9 build, my X-fi card is no longer recognized. The driver it uses is CA0110. I do not re-compile kernel. Susan FYI PS -- About sound quality... I had been running Dragon NaturallySpeaking 10 on Linux through wine using the driver. The program measures accuracy for dictated sounds, and my scores have been pretty good, running from 28-31. With the hda-intel they are 25-28.

2 1

[alsa-devel] [PATCH] USB quirk for Logitech Quickcam Pro 9000 name
by Peter Stokes 14 Jan '09

14 Jan '09

Hi, The Logitech QuickCam Pro 9000 does not appear to any product identification strings in its USB device descriptor. Therefore it receives a device name of "USB Device 0x46d:0x990". The attached patch below adds a USB quirk to provide a more friendly name. Also, for your reference, please find attached the output from "lsusb -vv -d 046d:0990" Best regards Peter Stokes ------------------------------------------------------------------------------- Signed-off-by: Peter Stokes <linux(a)dadeos.co.uk> diff --git a/usb/usbquirks.h b/usb/usbquirks.h index 9211575..5d8ef09 100644 --- a/usb/usbquirks.h +++ b/usb/usbquirks.h @@ -128,6 +128,14 @@ .bInterfaceClass = USB_CLASS_AUDIO, .bInterfaceSubClass = USB_SUBCLASS_AUDIO_CONTROL }, +{ + USB_DEVICE(0x046d, 0x0990), + .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) { + .vendor_name = "Logitech, Inc.", + .product_name = "QuickCam Pro 9000", + .ifnum = QUIRK_NO_INTERFACE + } +}, /* * Yamaha devices

2 1