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

[alsa-devel] kerneloops.org report for the week of June 14 2009
by Arjan van de Ven 16 Jun '09

16 Jun '09

Hi, First, a word of thanks to the kernel.org team for helping to host the kerneloops.org database on a real machine rather than a small virtualized host. Performance and continuity will be a lot better in the new setup! (as a result of the transition and hosting issues on the original server, there was a downtime of two days, meaning that the total number of reports is lower than typical) New sightings this report include the XFI driver, the i915 gem code and the DMAR code. This week, a total of 4026 oopses and warnings have been reported for kernels 2.6.29 and later. Reports for kernels earlier than 2.6.29 have been omitted from this report. Per file statistics 830 drivers/gpu/drm/i915/i915_gem_tiling.c 470 drivers/net/wireless/iwlwifi/iwl-sta.c 303 kernel/time.c 276 drivers/parport/procfs.c 269 include/linux/slob_def.h 187 include/linux/hrtimer.h 138 arch/x86/kernel/cpu/mtrr/generic.c 120 drivers/pci/dmar.c 65 net/mac80211/rc80211_minstrel.c 62 drivers/net/r8169.c 37 net/ipv4/tcp.c 34 fs/cifs/cifssmb.c Rank 1: i915_gem_set_tiling (warning) Reported 830 times (3700 total reports) [gem] Failure in the tiling code This warning was last seen in version 2.6.30, and first seen in 2.6.29-rc2. More info: http://www.kerneloops.org/searchweek.php?search=i915_gem_set_tiling Rank 2: iwl_set_dynamic_key (warning) Reported 470 times (13682 total reports) "no space for new kew" message. This warning was last seen in version 2.6.30, and first seen in 2.6.27. More info: http://www.kerneloops.org/searchweek.php?search=iwl_set_dynamic_key Rank 3: getnstimeofday (warning) Reported 309 times (2446 total reports) [suspend resume] getnstimeofday() is called before timekeeping is resumed This warning was last seen in version 2.6.29.4, and first seen in 2.6.24. More info: http://www.kerneloops.org/searchweek.php?search=getnstimeofday Rank 4: ct_vm_map (warning) - sleeping in atomic context Reported 285 times (960 total reports) Bug in the creative XFI driver (backported to Fedora) This warning was last seen in version 2.6.29.4, and first seen in 2.6.29-rc4-git1. More info: http://www.kerneloops.org/searchweek.php?search=ct_vm_map Rank 5: parport_device_proc_unregister (warning) Reported 278 times (1810 total reports) Alan has a fix for this on LKML This warning was last seen in version 2.6.29.4, and first seen in 2.6.27. More info: http://www.kerneloops.org/searchweek.php?search=parport_device_proc_unregis… Rank 6: hres_timers_resume (warning) Reported 188 times (1024 total reports) [suspend resume] hres_timers_resume() is incorrectly called with interrupts on This warning was last seen in version 2.6.30-rc6, and first seen in 2.6.24.7. More info: http://www.kerneloops.org/searchweek.php?search=hres_timers_resume Rank 7: generic_get_mtrr (warning) Reported 139 times (1009 total reports) BIOS bug where the MTRRs are not set up correctly This warning was last seen in version 2.6.30, and first seen in 2.6.25.3. More info: http://www.kerneloops.org/searchweek.php?search=generic_get_mtrr Rank 8: dmar_table_init (warning) Reported 121 times (507 total reports) BIOS bug exposed via a WARN_ON This warning was last seen in version 2.6.30-rc8, and first seen in 2.6.29. More info: http://www.kerneloops.org/searchweek.php?search=dmar_table_init Rank 9: minstrel_get_rate (warning) Reported 64 times (384 total reports) Issue with the ath5k driver This warning was last seen in version 2.6.30-rc3, and first seen in 2.6.27.12. More info: http://www.kerneloops.org/searchweek.php?search=minstrel_get_rate Rank 10: dev_watchdog(r8169) (warning) Reported 62 times (9116 total reports) This warning was last seen in version 2.6.30-rc7, and first seen in 2.6.26.6. More info: http://www.kerneloops.org/searchweek.php?search=dev_watchdog(r8169) Rank 11: nv_tx_done_optimized (warning) Reported 61 times (2974 total reports) the NV ethernet driver is getting caught with the new DMA API checks This warning was last seen in version 2.6.30, and first seen in 2.6.29-rc3-git7. More info: http://www.kerneloops.org/searchweek.php?search=nv_tx_done_optimized Rank 12: tcp_recvmsg (warning) Reported 37 times (3797 total reports) fixed in 2.6.30 (commit 775273131810caa41dfc7f9e552ea5d8508caf40) This warning was last seen in version 2.6.30, and first seen in 2.6.25. More info: http://www.kerneloops.org/searchweek.php?search=tcp_recvmsg -- Arjan van de Ven Intel Open Source Technology Centre For development, discussion and tips for power savings, visit http://www.lesswatts.org

3 3

Re: [alsa-devel] ALSA 1.0.20 Speex PCM Plugin
by Takashi Iwai 16 Jun '09

16 Jun '09

At Mon, 8 Jun 2009 15:56:38 -0400, Robert Krakora wrote: > > Takashi: > > I applied your Speex echo cancellation patch. I had to modify it > since the 'buf_out' buffer was not being malloc'd. Attached are the > files affected by your patch. The echo cancellation seems to work > pretty well. However, turning on 'denoise' seems to cause audio to > drop in and out at a very periodic rate. Do you have any example of > how to set up all of the parameters? A tutorial or something? Thanks > again. No idea, I just wrote it up blindly :) Can the preprocessor be dropped, possibly, like the patch below? Takashi --- diff --git a/doc/speexdsp.txt b/doc/speexdsp.txt index 875fc19..5b5e5a0 100644 --- a/doc/speexdsp.txt +++ b/doc/speexdsp.txt @@ -12,7 +12,7 @@ using libspeex DSP API. You can use the plugin with the plugin type Then record like - % arecord -fdat -c1 -Dplug:speex foo.wav + % arecord -fdat -c1 -Dplug:my_pcm foo.wav so that you'll get 48kHz mono stream with the denoising effect. @@ -44,6 +44,15 @@ The following parameters can be set optionally: A boolean value to enable/disable dereverb function. Default is no. +* echo + + A boolean value to enable/disable echo-cancellation function. + Default is no. + +* filter_length + + Number of samples of echo to cancel. As default it's 256. + For example, you can enable agc like pcm.my_pcm { diff --git a/speex/pcm_speex.c b/speex/pcm_speex.c index 7bb9213..757a400 100644 --- a/speex/pcm_speex.c +++ b/speex/pcm_speex.c @@ -1,5 +1,5 @@ /* - * Speex preprocess plugin + * Speex DSP plugin * * Copyright (c) 2009 by Takashi Iwai <tiwai(a)suse.de> * @@ -21,12 +21,15 @@ #include <alsa/asoundlib.h> #include <alsa/pcm_external.h> #include <speex/speex_preprocess.h> +#include <speex/speex_echo.h> -/* preprocessing parameters */ +/* DSP parameters */ struct spx_parms { int frames; int denoise; int agc; + int echo; + int filter_length; float agc_level; int dereverb; float dereverb_decay; @@ -38,7 +41,9 @@ typedef struct { struct spx_parms parms; /* instance and intermedate buffer */ SpeexPreprocessState *state; + SpeexEchoState *echo_state; short *buf; + short *outbuf; /* running states */ unsigned int filled; unsigned int processed; @@ -64,6 +69,18 @@ spx_transfer(snd_pcm_extplug_t *ext, short *src = area_addr(src_areas, src_offset); short *dst = area_addr(dst_areas, dst_offset); unsigned int count = size; + short *databuf; + + if (!spx->state && !spx->echo_state) { + /* no DSP processing */ + memcpy(dst, src, count * 2); + return size; + } + + if (spx->echo_state) + databuf = spx->outbuf; + else + databuf = spx->buf; while (count > 0) { unsigned int chunk; @@ -72,14 +89,20 @@ spx_transfer(snd_pcm_extplug_t *ext, else chunk = count; if (spx->processed) - memcpy(dst, spx->buf + spx->filled, chunk * 2); + memcpy(dst, databuf + spx->filled, chunk * 2); else memset(dst, 0, chunk * 2); dst += chunk; memcpy(spx->buf + spx->filled, src, chunk * 2); spx->filled += chunk; if (spx->filled == spx->parms.frames) { - speex_preprocess_run(spx->state, spx->buf); + if (spx->echo_state) + speex_echo_capture(spx->echo_state, spx->buf, + spx->outbuf); + if (spx->state) + speex_preprocess_run(spx->state, databuf); + if (spx->echo_state) + speex_echo_playback(spx->echo_state, databuf); spx->processed = 1; spx->filled = 0; } @@ -94,6 +117,9 @@ static int spx_init(snd_pcm_extplug_t *ext) { snd_pcm_speex_t *spx = (snd_pcm_speex_t *)ext; + spx->filled = 0; + spx->processed = 0; + if (!spx->buf) { spx->buf = malloc(spx->parms.frames * 2); if (!spx->buf) @@ -101,12 +127,43 @@ static int spx_init(snd_pcm_extplug_t *ext) } memset(spx->buf, 0, spx->parms.frames * 2); - if (spx->state) + if (!spx->outbuf) { + spx->outbuf = malloc(spx->parms.frames * 2); + if (!spx->outbuf) + return -ENOMEM; + } + memset(spx->outbuf, 0, spx->parms.frames * 2); + + if (spx->state) { speex_preprocess_state_destroy(spx->state); + spx->state = NULL; + } + if (spx->echo_state) { + speex_echo_state_destroy(spx->echo_state); + spx->echo_state = NULL; + } + + if (spx->parms.echo) { + spx->echo_state = speex_echo_state_init(spx->parms.frames, + spx->parms.filter_length); + if (!spx->echo_state) + return -EIO; + speex_echo_ctl(spx->echo_state, SPEEX_ECHO_SET_SAMPLING_RATE, + &spx->ext.rate); + } + + /* no preprocessor? */ + if (!spx->parms.denoise && !spx->parms.agc && !spx->parms.dereverb) + return 0; + spx->state = speex_preprocess_state_init(spx->parms.frames, spx->ext.rate); if (!spx->state) return -EIO; + if (spx->echo_state) + speex_preprocess_ctl(spx->state, + SPEEX_PREPROCESS_SET_ECHO_STATE, + spx->echo_state); speex_preprocess_ctl(spx->state, SPEEX_PREPROCESS_SET_DENOISE, &spx->parms.denoise); @@ -120,18 +177,18 @@ static int spx_init(snd_pcm_extplug_t *ext) &spx->parms.dereverb_decay); speex_preprocess_ctl(spx->state, SPEEX_PREPROCESS_SET_DEREVERB_LEVEL, &spx->parms.dereverb_level); - - spx->filled = 0; - spx->processed = 0; return 0; } static int spx_close(snd_pcm_extplug_t *ext) { snd_pcm_speex_t *spx = (snd_pcm_speex_t *)ext; + free(spx->outbuf); free(spx->buf); if (spx->state) speex_preprocess_state_destroy(spx->state); + if (spx->echo_state) + speex_echo_state_destroy(spx->echo_state); return 0; } @@ -205,6 +262,8 @@ SND_PCM_PLUGIN_DEFINE_FUNC(speex) .dereverb = 0, .dereverb_decay = 0, .dereverb_level = 0, + .echo = 0, + .filter_length = 256, }; snd_config_for_each(i, next, conf) { @@ -242,6 +301,13 @@ SND_PCM_PLUGIN_DEFINE_FUNC(speex) &parms.dereverb_level); if (err) goto ok; + err = get_bool_parm(n, id, "echo", &parms.echo); + if (err) + goto ok; + err = get_int_parm(n, id, "filter_length", + &parms.filter_length); + if (err) + goto ok; SNDERR("Unknown field %s", id); err = -EINVAL; ok: @@ -259,7 +325,7 @@ SND_PCM_PLUGIN_DEFINE_FUNC(speex) return -ENOMEM; spx->ext.version = SND_PCM_EXTPLUG_VERSION; - spx->ext.name = "Speex Denoise Plugin"; + spx->ext.name = "Speex DSP Plugin"; spx->ext.callback = &speex_callback; spx->ext.private_data = spx; spx->parms = parms;

2 2

[alsa-devel] [PATCH 2/3] ASoC: pxa-ssp.c, Automatically set TDM when needed
by Daniel Ribeiro 16 Jun '09

16 Jun '09

* Automatically sets TDM mode for frame_width larger than 32 bits, if the user doesn't setup the TDM slots with set_tdm_slot(). * Reset SSCR0_EDSS and SSCR0_DSS on pxa_ssp_set_dai_fmt. * Makes SSCR0_MOD optional. * Clears SSCR1_RWOT case SSCR0_MOD is set. Signed-off-by: Daniel Ribeiro <drwyrm(a)gmail.com> --- sound/soc/pxa/pxa-ssp.c | 92 +++++++++++++++++++++++++++-------------------- 1 files changed, 53 insertions(+), 39 deletions(-) diff --git a/sound/soc/pxa/pxa-ssp.c b/sound/soc/pxa/pxa-ssp.c index 5b9ed64..d60492e 100644 --- a/sound/soc/pxa/pxa-ssp.c +++ b/sound/soc/pxa/pxa-ssp.c @@ -452,8 +452,8 @@ static int pxa_ssp_set_dai_fmt(struct snd_soc_dai *cpu_dai, } /* reset port settings */ - sscr0 = ssp_read_reg(ssp, SSCR0) & - (SSCR0_ECS | SSCR0_NCS | SSCR0_MOD | SSCR0_ACS); + sscr0 = ssp_read_reg(ssp, SSCR0) & (SSCR0_ECS | SSCR0_NCS | SSCR0_MOD | + SSCR0_ACS | SSCR0_DSS | SSCR0_EDSS); sscr1 = SSCR1_RxTresh(8) | SSCR1_TxTresh(7); sspsp = 0; @@ -496,7 +496,7 @@ static int pxa_ssp_set_dai_fmt(struct snd_soc_dai *cpu_dai, case SND_SOC_DAIFMT_DSP_A: sspsp |= SSPSP_FSRT; case SND_SOC_DAIFMT_DSP_B: - sscr0 |= SSCR0_MOD | SSCR0_PSP; + sscr0 |= SSCR0_PSP; sscr1 |= SSCR1_TRAIL | SSCR1_RWOT; break; @@ -532,48 +532,70 @@ static int pxa_ssp_hw_params(struct snd_pcm_substream *substream, struct ssp_priv *priv = cpu_dai->private_data; struct ssp_device *ssp = priv->dev.ssp; int chn = params_channels(params); - u32 sscr0; - u32 sspsp; + u32 sscr0, sscr1, sspsp; int width = snd_pcm_format_physical_width(params_format(params)); - int ttsa = ssp_read_reg(ssp, SSTSA) & 0xf; + int slot_width, frame_width = 0; + + /* check if the user explicitly set a slot_width */ + sscr0 = ssp_read_reg(ssp, SSCR0); + + if (sscr0 & (SSCR0_EDSS | SSCR0_DSS)) + slot_width = (sscr0 & SSCR0_DSS) + + (sscr0 & SSCR0_EDSS ? 17 : 1); + else + frame_width = slot_width = width * chn; /* generate correct DMA params */ if (cpu_dai->dma_data) kfree(cpu_dai->dma_data); - /* Network mode with one active slot (ttsa == 1) can be used - * to force 16-bit frame width on the wire (for S16_LE), even - * with two channels. Use 16-bit DMA transfers for this case. - */ - cpu_dai->dma_data = ssp_get_dma_params(ssp, - ((chn == 2) && (ttsa != 1)) || (width == 32), + cpu_dai->dma_data = ssp_get_dma_params(ssp, slot_width > 16, substream->stream == SNDRV_PCM_STREAM_PLAYBACK); /* we can only change the settings if the port is not in use */ - if (ssp_read_reg(ssp, SSCR0) & SSCR0_SSE) + if (sscr0 & SSCR0_SSE) return 0; - /* clear selected SSP bits */ - sscr0 = ssp_read_reg(ssp, SSCR0) & ~(SSCR0_DSS | SSCR0_EDSS); - ssp_write_reg(ssp, SSCR0, sscr0); - - /* bit size */ - sscr0 = ssp_read_reg(ssp, SSCR0); - switch (params_format(params)) { - case SNDRV_PCM_FORMAT_S16_LE: #ifdef CONFIG_PXA3xx - if (cpu_is_pxa3xx()) - sscr0 |= SSCR0_FPCKE; + if (slot_width == 16 && cpu_is_pxa3xx()) + sscr0 |= SSCR0_FPCKE; #endif - sscr0 |= SSCR0_DataSize(16); - break; - case SNDRV_PCM_FORMAT_S24_LE: - sscr0 |= (SSCR0_EDSS | SSCR0_DataSize(8)); - break; - case SNDRV_PCM_FORMAT_S32_LE: - sscr0 |= (SSCR0_EDSS | SSCR0_DataSize(16)); - break; + + if (frame_width > 0) { + /* Not using network mode */ + if (frame_width > 16) + sscr0 |= SSCR0_EDSS | SSCR0_DataSize(frame_width - 16); + else + sscr0 |= SSCR0_DataSize(frame_width); + + if (frame_width > 32) { + /* + * Network mode is needed to support this frame width. + * We assume the wire is not networked and setup a + * fake network mode here. Use as many slots as needed + * each with 32 bits. + */ + int slots = frame_width / 32; + + sscr0 |= SSCR0_MOD; + sscr0 |= SSCR0_SlotsPerFrm(slots); + + /* + * Set active slots. Only set an active TX slot + * if we are going to use it. + */ + ssp_write_reg(ssp, SSRSA, slots - 1); + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) + ssp_write_reg(ssp, SSTSA, slots - 1); + } } + + /* If SSCR0_MOD is set we can't use SSCR1_RWOT */ + if (sscr0 & SSCR0_MOD) { + sscr1 = ssp_read_reg(ssp, SSCR1); + ssp_write_reg(ssp, SSCR1, sscr1 & ~SSCR1_RWOT); + } + ssp_write_reg(ssp, SSCR0, sscr0); switch (priv->dai_fmt & SND_SOC_DAIFMT_FORMAT_MASK) { @@ -620,14 +642,6 @@ static int pxa_ssp_hw_params(struct snd_pcm_substream *substream, break; } - /* When we use a network mode, we always require TDM slots - * - complain loudly and fail if they've not been set up yet. - */ - if ((sscr0 & SSCR0_MOD) && !ttsa) { - dev_err(&ssp->pdev->dev, "No TDM timeslot configured\n"); - return -EINVAL; - } - dump_registers(ssp); return 0; -- tg: (b977873..) asoc/ssp-internals (depends on: asoc/set_tdm_slot) -- Daniel Ribeiro

1 0

[alsa-devel] [PATCH 1/3] ASoC: magician: fix PXA SSP clock polarity
by Philipp Zabel 16 Jun '09

16 Jun '09

Follow-up fix needed since "ASoC: pxa-ssp.c fix clock/frame invert". Signed-off-by: Philipp Zabel <philipp.zabel(a)gmail.com> --- sound/soc/pxa/magician.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/sound/soc/pxa/magician.c b/sound/soc/pxa/magician.c index a04ddc3..fa0e7e6 100644 --- a/sound/soc/pxa/magician.c +++ b/sound/soc/pxa/magician.c @@ -183,7 +183,7 @@ static int magician_playback_hw_params(struct snd_pcm_substream *substream, /* set cpu DAI configuration */ ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_DSP_A | - SND_SOC_DAIFMT_IB_IF | SND_SOC_DAIFMT_CBS_CFS); + SND_SOC_DAIFMT_NB_IF | SND_SOC_DAIFMT_CBS_CFS); if (ret < 0) return ret; -- 1.6.3.1

6 12

[alsa-devel] PROBLEM WITH EMAIL
by Guilherme 15 Jun '09

15 Jun '09

MATES... My emails are not getting through...! How can I send e-mail to the list? -- Tks! ------------------- Guilherme Longo Dept. Eng. da Computação Unaerp Linux User - #484927 *Before Asking http://www.istf.com.br/?page=perguntas !- I'd rather die on my feet than live on my knees -!

2 1

[alsa-devel] Timing of linked devices
by louis＠museresearch.com 15 Jun '09

15 Jun '09

I am developing an application which opens both inputs and outputs for digital and s/pdif (so, 4 devices). The sync IDs all match. However, under certain conditions, I am receiving partial buffers from the input. So, I have a few questions: Does linking input and output devices, from a programmer's perspective, mean that input is ready at precisely the same time that the device is ready to output a buffer? Or, does it only mean that the ins and outs will be synchronized for each given buffer? More to the point, will blocking on a write also accurately tell the program when the device is ready for a read (including under non-ideal circumstances like after a bunch of xruns)? And, in the case that I am doing a non-blocking read (pcm_read) from a buffer which is not yet ready, should I receive an outdated buffer, a blank buffer, or one which has both partially new and partially old data? I am using ALSA 1.0.15 and the ICE1724 driver. Thanks in advance for your help! - Louis

2 1

Re: [alsa-devel] snd-ctxfi oops
by The Source 15 Jun '09

15 Jun '09

On 12.06.2009 22:22, The Source wrote: > On 12.06.2009 11:20, Takashi Iwai wrote: >> At Fri, 12 Jun 2009 07:52:22 +0400, >> The Source wrote: >>> Hello. I use snd-ctxfi from 8 June snapshot. I hadn't oopses since I >>> installed this driver but recently I got one again: >>> >>> Kernel failure message 1: >>> BUG: sleeping function called from invalid context at mm/slub.c:1599 >> Could you try the patch below? >> >> >> thanks, >> >> Takashi >> >> --- >> diff --git a/sound/pci/ctxfi/ctatc.c b/sound/pci/ctxfi/ctatc.c >> index 80fb2ba..b0adc80 100644 >> --- a/sound/pci/ctxfi/ctatc.c >> +++ b/sound/pci/ctxfi/ctatc.c >> @@ -259,7 +259,6 @@ static int atc_pcm_playback_prepare(struct ct_atc >> *atc, struct ct_atc_pcm *apcm) >> int n_amixer = apcm->substream->runtime->channels, i = 0; >> int device = apcm->substream->pcm->device; >> unsigned int pitch; >> - unsigned long flags; >> >> if (NULL != apcm->src) { >> /* Prepared pcm playback */ >> @@ -311,10 +310,10 @@ static int atc_pcm_playback_prepare(struct >> ct_atc *atc, struct ct_atc_pcm *apcm) >> src = apcm->src; >> for (i = 0; i< n_amixer; i++) { >> amixer = apcm->amixers[i]; >> - spin_lock_irqsave(&atc->atc_lock, flags); >> + mutex_lock(&atc->atc_mutex); >> amixer->ops->setup(amixer,&src->rsc, >> INIT_VOL, atc->pcm[i+device*2]); >> - spin_unlock_irqrestore(&atc->atc_lock, flags); >> + mutex_unlock(&atc->atc_mutex); >> src = src->ops->next_interleave(src); >> if (NULL == src) >> src = apcm->src; >> @@ -865,7 +864,6 @@ static int >> spdif_passthru_playback_setup(struct ct_atc *atc, struct ct_atc_pcm >> *apcm) >> { >> struct dao *dao = container_of(atc->daios[SPDIFOO], struct dao, >> daio); >> - unsigned long flags; >> unsigned int rate = apcm->substream->runtime->rate; >> unsigned int status; >> int err; >> @@ -885,7 +883,7 @@ spdif_passthru_playback_setup(struct ct_atc *atc, >> struct ct_atc_pcm *apcm) >> return -ENOENT; >> } >> >> - spin_lock_irqsave(&atc->atc_lock, flags); >> + mutex_lock(&atc->atc_mutex); >> dao->ops->get_spos(dao,&status); >> if (((status>> 24)& IEC958_AES3_CON_FS) != iec958_con_fs) { >> status&= ((~IEC958_AES3_CON_FS)<< 24); >> @@ -895,7 +893,7 @@ spdif_passthru_playback_setup(struct ct_atc *atc, >> struct ct_atc_pcm *apcm) >> } >> if ((rate != atc->pll_rate)&& (32000 != rate)) >> err = atc_pll_init(atc, rate); >> - spin_unlock_irqrestore(&atc->atc_lock, flags); >> + mutex_unlock(&atc->atc_mutex); >> >> return err; >> } >> @@ -908,7 +906,6 @@ spdif_passthru_playback_prepare(struct ct_atc >> *atc, struct ct_atc_pcm *apcm) >> struct dao *dao; >> int err; >> int i; >> - unsigned long flags; >> >> if (NULL != apcm->src) >> return 0; >> @@ -934,13 +931,13 @@ spdif_passthru_playback_prepare(struct ct_atc >> *atc, struct ct_atc_pcm *apcm) >> src = apcm->src; >> } >> /* Connect to SPDIFOO */ >> - spin_lock_irqsave(&atc->atc_lock, flags); >> + mutex_lock(&atc->atc_mutex); >> dao = container_of(atc->daios[SPDIFOO], struct dao, daio); >> amixer = apcm->amixers[0]; >> dao->ops->set_left_input(dao,&amixer->rsc); >> amixer = apcm->amixers[1]; >> dao->ops->set_right_input(dao,&amixer->rsc); >> - spin_unlock_irqrestore(&atc->atc_lock, flags); >> + mutex_unlock(&atc->atc_mutex); >> >> ct_timer_prepare(apcm->timer); >> >> @@ -1088,7 +1085,6 @@ static int atc_spdif_out_set_status(struct >> ct_atc *atc, unsigned int status) >> >> static int atc_spdif_out_passthru(struct ct_atc *atc, unsigned char >> state) >> { >> - unsigned long flags; >> struct dao_desc da_dsc = {0}; >> struct dao *dao; >> int err; >> @@ -1096,7 +1092,7 @@ static int atc_spdif_out_passthru(struct ct_atc >> *atc, unsigned char state) >> struct rsc *rscs[2] = {NULL}; >> unsigned int spos = 0; >> >> - spin_lock_irqsave(&atc->atc_lock, flags); >> + mutex_lock(&atc->atc_mutex); >> dao = container_of(atc->daios[SPDIFOO], struct dao, daio); >> da_dsc.msr = state ? 1 : atc->msr; >> da_dsc.passthru = state ? 1 : 0; >> @@ -1114,7 +1110,7 @@ static int atc_spdif_out_passthru(struct ct_atc >> *atc, unsigned char state) >> } >> dao->ops->set_spos(dao, spos); >> dao->ops->commit_write(dao); >> - spin_unlock_irqrestore(&atc->atc_lock, flags); >> + mutex_unlock(&atc->atc_mutex); >> >> return err; >> } >> @@ -1572,7 +1568,7 @@ int __devinit ct_atc_create(struct snd_card >> *card, struct pci_dev *pci, >> atc->msr = msr; >> atc->chip_type = chip_type; >> >> - spin_lock_init(&atc->atc_lock); >> + mutex_init(&atc->atc_mutex); >> >> /* Find card model */ >> err = atc_identify_card(atc); >> diff --git a/sound/pci/ctxfi/ctatc.h b/sound/pci/ctxfi/ctatc.h >> index a033472..9fe620e 100644 >> --- a/sound/pci/ctxfi/ctatc.h >> +++ b/sound/pci/ctxfi/ctatc.h >> @@ -19,7 +19,7 @@ >> #define CTATC_H >> >> #include<linux/types.h> >> -#include<linux/spinlock_types.h> >> +#include<linux/mutex.h> >> #include<linux/pci.h> >> #include<linux/timer.h> >> #include<sound/core.h> >> @@ -90,7 +90,7 @@ struct ct_atc { >> void (*unmap_audio_buffer)(struct ct_atc *atc, struct >> ct_atc_pcm *apcm); >> unsigned long (*get_ptp_phys)(struct ct_atc *atc, int index); >> >> - spinlock_t atc_lock; >> + struct mutex atc_mutex; >> >> int (*pcm_playback_prepare)(struct ct_atc *atc, >> struct ct_atc_pcm *apcm); >> > No oopses with this patch so far, thank you. Tested the patch more. Really no oopses. Instead of them I get rare system lockups.

2 2

[alsa-devel] ASoC: About amp driver
by Joonyoung Shim 15 Jun '09

15 Jun '09

Hi. I have one question. Currently, the amp driver of ASoC is included in machine driver. (ex. neo1973_wm8753 machine driver) I want to use the same amp driver in more than one machine driver, but then the same amp driver code exists double in each machine driver. So, how about spliting between the amp driver and the machine driver? and Is it possible?

2 3

[alsa-devel] [PATCH 0/4] ASoC updates for 2.6.31
by Mark Brown 15 Jun '09

15 Jun '09

The following changes since commit 236e6723bedb483b2ebf73ada01e2c853c5cac01: Mark Brown (1): ASoC: Fix lm4857 control are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git for-2.6.31 Mark Brown (3): ASoC: Remove odd bit clock ratios for WM8903 ASoC: Revert duplicated code in SSM2602 driver ASoC: Instantiate any forgotten DAPM widgets Philipp Zabel (1): ASoC: magician: fix PXA SSP clock polarity sound/soc/codecs/ssm2602.c | 4 ---- sound/soc/codecs/wm8903.c | 4 ---- sound/soc/pxa/magician.c | 2 +- sound/soc/soc-core.c | 3 +++ 4 files changed, 4 insertions(+), 9 deletions(-)

2 5

Re: [alsa-devel] [Alsa-user] Problems with Soundblaster X-Fi
by WILMES Andreas 15 Jun '09

15 Jun '09

Daniel Herrmann wrote: > Same error than before... > > Didn't change anything, but thanks Are you sure that you're using the same gcc-compiler on the alsa modules as same as on the kernel? The compiler-versions might being different.

1 0