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

[alsa-devel] [PATCH] ALSA: ASoC: Fix memory leaks for the CS4270 driver
by Timur Tabi 05 Sep '08

05 Sep '08

The CS4270 ASoC driver was not cleaning up resources completely during an I2C unbind. The same problem could occur if the bind failed. Rearranged a couple functions to eliminate an unnecessary function declaration. Signed-off-by: Timur Tabi <timur(a)freescale.com> --- This patch is a fix for 2.6.27. It applies only to the ASoC V1 version of the driver. A similar fix for the V2 version will be posted later. sound/soc/codecs/cs4270.c | 94 ++++++++++++++++++++++++++++++-------------- 1 files changed, 64 insertions(+), 30 deletions(-) diff --git a/sound/soc/codecs/cs4270.c b/sound/soc/codecs/cs4270.c index 82d94f0..eb38e92 100644 --- a/sound/soc/codecs/cs4270.c +++ b/sound/soc/codecs/cs4270.c @@ -490,29 +490,6 @@ static int cs4270_mute(struct snd_soc_dai *dai, int mute) #endif -static int cs4270_i2c_probe(struct i2c_client *, const struct i2c_device_id *); - -/* A list of non-DAPM controls that the CS4270 supports */ -static const struct snd_kcontrol_new cs4270_snd_controls[] = { - SOC_DOUBLE_R("Master Playback Volume", - CS4270_VOLA, CS4270_VOLB, 0, 0xFF, 1) -}; - -static const struct i2c_device_id cs4270_id[] = { - {"cs4270", 0}, - {} -}; -MODULE_DEVICE_TABLE(i2c, cs4270_id); - -static struct i2c_driver cs4270_i2c_driver = { - .driver = { - .name = "CS4270 I2C", - .owner = THIS_MODULE, - }, - .id_table = cs4270_id, - .probe = cs4270_i2c_probe, -}; - /* * Global variable to store socdev for i2c probe function. * @@ -530,6 +507,12 @@ static struct i2c_driver cs4270_i2c_driver = { */ static struct snd_soc_device *cs4270_socdev; +/* A list of non-DAPM controls that the CS4270 supports */ +static const struct snd_kcontrol_new cs4270_snd_controls[] = { + SOC_DOUBLE_R("Master Playback Volume", + CS4270_VOLA, CS4270_VOLB, 0, 0xFF, 1) +}; + /* * Initialize the I2C interface of the CS4270 * @@ -559,8 +542,7 @@ static int cs4270_i2c_probe(struct i2c_client *i2c_client, codec->reg_cache = kzalloc(CS4270_NUMREGS, GFP_KERNEL); if (!codec->reg_cache) { printk(KERN_ERR "cs4270: could not allocate register cache\n"); - ret = -ENOMEM; - goto error; + return -ENOMEM; } /* Verify that we have a CS4270 */ @@ -610,20 +592,72 @@ static int cs4270_i2c_probe(struct i2c_client *i2c_client, return 0; error: - if (codec->control_data) { - i2c_detach_client(i2c_client); - codec->control_data = NULL; + for (i = 1; i <= ARRAY_SIZE(cs4270_snd_controls); i++) { + struct snd_kcontrol *kctrl = + snd_ctl_find_numid(codec->card, i); + + if (kctrl) + snd_ctl_remove(codec->card, kctrl); } + codec->control_data = NULL; + kfree(codec->reg_cache); codec->reg_cache = NULL; codec->reg_cache_size = 0; - kfree(i2c_client); - return ret; } +/* + * Remove I2C interface of the CS4270 + * + * Since this driver cannot be compiled as a module, the only way this + * function can be called is if the I2C subsystem unbinds it. This can be + * triggered, for instance, by writing the device ID to this drivers + * 'unbind' file in /sys. + */ +static int cs4270_i2c_remove(struct i2c_client *i2c_client) +{ + struct snd_soc_codec *codec = i2c_get_clientdata(i2c_client); + + if (codec) { + unsigned int i; + + for (i = 1; i <= ARRAY_SIZE(cs4270_snd_controls); i++) { + struct snd_kcontrol *kctrl = + snd_ctl_find_numid(codec->card, i); + + if (kctrl) + snd_ctl_remove(codec->card, kctrl); + } + + codec->control_data = NULL; + + kfree(codec->reg_cache); + codec->reg_cache = NULL; + codec->reg_cache_size = 0; + } + + return 0; +} + +static const struct i2c_device_id cs4270_id[] = { + {"cs4270", 0}, + {} +}; +MODULE_DEVICE_TABLE(i2c, cs4270_id); + +static struct i2c_driver cs4270_i2c_driver = { + .driver = { + .name = "cs4270", + .owner = THIS_MODULE, + }, + .id_table = cs4270_id, + .probe = cs4270_i2c_probe, + .remove = cs4270_i2c_remove, +}; + #endif /* USE_I2C*/ struct snd_soc_dai cs4270_dai = { -- 1.5.5

2 9

[alsa-devel] [PATCH 0/9] ASoC Blackfin supporting (v2)
by Bryan Wu 05 Sep '08

05 Sep '08

Hi Mark, With Cliff's effort, we update this patch series quickly according to your review. v1-v2: - move ASoC Blackfin Kconfig and Makefile patch to be the last one in the series - fix coding style issues - The SND_SOC_DAFIMT_LEFT_J: ought to be default - fix other minor issues v0-v1: - fix coding style issues - use latest ASoC API - split the whole patch into this 9 patches in a patchset Thanks a lot -Bryan

2 14

[alsa-devel] Problems recording with HP DV2839TX laptop.
by Travis Place 05 Sep '08

05 Sep '08

Hello everyone, Im Travis (wishie) once of the many helpers who man the unofficial #alsa on freenode irc network.. I usually spend my time fixing other peoples sound issues, but now i have my own. I have a HP DV2839TX laptop, and i get ALOT of static when recording via the inbuilt mic. Also, the mic controls are very strange.. I have (in the Capture section of alsamixer).. Digital, Docking Mic, External Mic, Internal Mic.. only the "Digital" control seems to effect my recording volume at all. Strangely, though, the '* Mic' controls in the PLAYBACK section of alsamixer do change the recording properties somewhat (volume being the main factor). In any event, i get a rather large amount of static, no matter what mixer settings i try. This isnt a problem in the 'other' OS. My alsa-info.sh output for alsa-driver 1.0.16 is at : http://www.alsa-project.org/db/?f=0d1df6446ff1c71ad305e7b7b367f0a6b22b80c8 My alsa-info.sh output for alsa-driver 1.0.18rc1 is at : http://www.alsa-project.org/db/?f=9e5cd99f4822e0d671866fa630698bd1b0cd954b

2 2

[alsa-devel] WM8750 mixer controls
by Harald Radke 05 Sep '08

05 Sep '08

Hi there! I noticed that using "alsamixer" several controls that are connected to sound input (ALC) are listed in the "playback" tab as well as in "capture", as well as certain playback controls as "bass" "trebel" also can be found under "capture". However, changing those controls' values only seem to take effect in the "playback" tab. I was wondering if this is intentional or unintentional done by the WM8750 codec driver or an alsamixer "feature". Thx Greez, Harry

2 1

Re: [alsa-devel] [PATCH] add the nvidia HDMI codec driver for MCP77/79
by Takashi Iwai 05 Sep '08

05 Sep '08

At Wed, 3 Sep 2008 15:58:17 +0800, peerchen wrote: > > Add the nvidia HDMI codec driver for MCP77/79. > The patch based on kernel 2.6.27-rc5. > > Signed-off-by: Wei Ni <wni(a)nvidia.com> > Signed-off-by: Peer Chen <peerchen(a)gmail.com> Thanks for the patch. Some comments below. > diff -uprN -X linux-2.6.26-Orig/Documentation/dontdiff linux-2.6.26-Orig/sound/pci/hda/hda_intel.c linux-2.6.26-New/sound/pci/hda/hda_intel.c > --- linux-2.6.26-Orig/sound/pci/hda/hda_intel.c 2008-08-28 13:47:20.000000000 +0800 > +++ linux-2.6.26-New/sound/pci/hda/hda_intel.c 2008-08-28 15:33:51.000000000 +0800 > @@ -223,8 +223,8 @@ enum { SDI0, SDI1, SDI2, SDI3, SDO0, SDO > #define RIRB_INT_MASK 0x05 > > /* STATESTS int mask: SD2,SD1,SD0 */ > -#define AZX_MAX_CODECS 3 > -#define STATESTS_INT_MASK 0x07 > +#define AZX_MAX_CODECS 4 > +#define STATESTS_INT_MASK 0x0f This may break other platforms. Expanding STATESTS_INT_MASK is OK and would be harmless, but AZX_MAX_CODECS is not. AZX_MAX_CODECS is the default number of max codecs. The chipset specific max number of codecs is defined in azx_max_codecs[]. If Nvidia chipsets supports properly more than 3, change azx_max_codecs[AZX_DRIVER_NVIDIA] to 4. > +static unsigned short convert_from_spdif_status_nv(unsigned int sbits) > +{ > + unsigned short val = 0; > + > + if (sbits & IEC958_AES0_PROFESSIONAL) > + val |= AC_DIG1_PROFESSIONAL; > + if (sbits & IEC958_AES0_NONAUDIO) > + val |= AC_DIG1_NONAUDIO; > + if (sbits & IEC958_AES0_PROFESSIONAL) { > + if ((sbits & IEC958_AES0_PRO_EMPHASIS) == > + IEC958_AES0_PRO_EMPHASIS_5015) > + val |= AC_DIG1_EMPHASIS; > + } else { > + if ((sbits & IEC958_AES0_CON_EMPHASIS) == > + IEC958_AES0_CON_EMPHASIS_5015) > + val |= AC_DIG1_EMPHASIS; > + if (!(sbits & IEC958_AES0_CON_NOT_COPYRIGHT)) > + val |= AC_DIG1_COPYRIGHT; > + if (sbits & (IEC958_AES1_CON_ORIGINAL << 8)) > + val |= AC_DIG1_LEVEL; > + val |= sbits & (IEC958_AES1_CON_CATEGORY << 8); > + } > + return val; > +} > + > +static unsigned int convert_to_spdif_status_nv(unsigned short val) > +{ > + unsigned int sbits = 0; > + > + if (val & AC_DIG1_NONAUDIO) > + sbits |= IEC958_AES0_NONAUDIO; > + if (val & AC_DIG1_PROFESSIONAL) > + sbits |= IEC958_AES0_PROFESSIONAL; > + if (sbits & IEC958_AES0_PROFESSIONAL) { > + if (sbits & AC_DIG1_EMPHASIS) > + sbits |= IEC958_AES0_PRO_EMPHASIS_5015; > + } else { > + if (val & AC_DIG1_EMPHASIS) > + sbits |= IEC958_AES0_CON_EMPHASIS_5015; > + if (!(val & AC_DIG1_COPYRIGHT)) > + sbits |= IEC958_AES0_CON_NOT_COPYRIGHT; > + if (val & AC_DIG1_LEVEL) > + sbits |= (IEC958_AES1_CON_ORIGINAL << 8); > + sbits |= val & (0x7f << 8); > + } > + return sbits; > +} > + > +static int snd_hda_hdmi_cmask_get(struct snd_kcontrol *kcontrol, > + struct snd_ctl_elem_value *ucontrol) > +{ > + ucontrol->value.iec958.status[0] = IEC958_AES0_PROFESSIONAL | > + IEC958_AES0_NONAUDIO | > + IEC958_AES0_CON_EMPHASIS_5015 | > + IEC958_AES0_CON_NOT_COPYRIGHT; > + ucontrol->value.iec958.status[1] = IEC958_AES1_CON_CATEGORY | > + IEC958_AES1_CON_ORIGINAL; > + return 0; > +} > + > +static int snd_hda_hdmi_pmask_get(struct snd_kcontrol *kcontrol, > + struct snd_ctl_elem_value *ucontrol) > +{ > + ucontrol->value.iec958.status[0] = IEC958_AES0_PROFESSIONAL | > + IEC958_AES0_NONAUDIO | > + IEC958_AES0_PRO_EMPHASIS_5015; > + return 0; > +} > + > +static int snd_hda_hdmi_mask_info(struct snd_kcontrol *kcontrol, > + struct snd_ctl_elem_info *uinfo) > +{ > + uinfo->type = SNDRV_CTL_ELEM_TYPE_IEC958; > + uinfo->count = 1; > + return 0; > +} > + > +static int snd_hda_hdmi_default_get(struct snd_kcontrol *kcontrol, > + struct snd_ctl_elem_value *ucontrol) > +{ > + struct hda_codec *codec = snd_kcontrol_chip(kcontrol); > + > + ucontrol->value.iec958.status[0] = codec->spdif_status & 0xff; > + ucontrol->value.iec958.status[1] = (codec->spdif_status >> 8) & 0xff; > + ucontrol->value.iec958.status[2] = (codec->spdif_status >> 16) & 0xff; > + ucontrol->value.iec958.status[3] = (codec->spdif_status >> 24) & 0xff; > + > + return 0; > +} > + > +static int snd_hda_hdmi_default_put(struct snd_kcontrol *kcontrol, > + struct snd_ctl_elem_value *ucontrol) > +{ > + struct hda_codec *codec = snd_kcontrol_chip(kcontrol); > + hda_nid_t nid = kcontrol->private_value; > + unsigned short val; > + int change; > + > + mutex_lock(&codec->spdif_mutex); > + codec->spdif_status = ucontrol->value.iec958.status[0] | > + ((unsigned int)ucontrol->value.iec958.status[1] << 8) | > + ((unsigned int)ucontrol->value.iec958.status[2] << 16) | > + ((unsigned int)ucontrol->value.iec958.status[3] << 24); > + val = convert_from_spdif_status_nv(codec->spdif_status); > + val |= codec->spdif_ctls & 1; > + change = codec->spdif_ctls != val; > + codec->spdif_ctls = val; > + > + if (change) { > + snd_hda_codec_write_cache(codec, nid, 0, > + AC_VERB_SET_DIGI_CONVERT_1, > + val & 0xff); > + snd_hda_codec_write_cache(codec, nid, 0, > + AC_VERB_SET_DIGI_CONVERT_2, > + val >> 8); > + } > + > + mutex_unlock(&codec->spdif_mutex); > + return change; > +} > + > +#define snd_hda_hdmi_out_switch_info snd_ctl_boolean_mono_info > + > +static int snd_hda_hdmi_out_switch_get(struct snd_kcontrol *kcontrol, > + struct snd_ctl_elem_value *ucontrol) > +{ > + struct hda_codec *codec = snd_kcontrol_chip(kcontrol); > + > + ucontrol->value.integer.value[0] = codec->spdif_ctls & AC_DIG1_ENABLE; > + return 0; > +} > + > +static int snd_hda_hdmi_out_switch_put(struct snd_kcontrol *kcontrol, > + struct snd_ctl_elem_value *ucontrol) > +{ > + struct hda_codec *codec = snd_kcontrol_chip(kcontrol); > + hda_nid_t nid = kcontrol->private_value; > + unsigned short val; > + int change; > + > + mutex_lock(&codec->spdif_mutex); > + val = codec->spdif_ctls & ~AC_DIG1_ENABLE; > + if (ucontrol->value.integer.value[0]) > + val |= AC_DIG1_ENABLE; > + change = codec->spdif_ctls != val; > + if (change) { > + codec->spdif_ctls = val; > + snd_hda_codec_write_cache(codec, nid, 0, > + AC_VERB_SET_DIGI_CONVERT_1, > + val & 0xff); > + /* unmute amp switch (if any) */ > + if ((get_wcaps(codec, nid) & AC_WCAP_OUT_AMP) && > + (val & AC_DIG1_ENABLE)) > + snd_hda_codec_amp_stereo(codec, nid, HDA_OUTPUT, 0, > + HDA_AMP_MUTE, 0); > + } > + mutex_unlock(&codec->spdif_mutex); > + return change; > +} These are almost identical with the functions in hda_codec.c. Is your intention to allow a different set of IEC958 status bits controls for HDMI *in addition* to SPDIF? If so, we should change the codes in hda_codec.c to allow other control names. > +struct snd_kcontrol_new hdmi_mixes[] = { > + { > + .access = SNDRV_CTL_ELEM_ACCESS_READ, > + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, > + .name = "IEC958 Playback Con Mask HDMI", > + .info = snd_hda_hdmi_mask_info, > + .get = snd_hda_hdmi_cmask_get, > + }, These have also different names from the standard ones. Any reason? > +static struct hda_pcm_stream nvhdmi_pcm_digital_playback = { > + .substreams = 1, > + .channels_min = 2, > + .channels_max = 2, > + .nid = 0x4, /* NID to query formats and rates and setup streams */ > + .rates = SNDRV_PCM_RATE_48000, > + .maxbps = 16, > + .formats = SNDRV_PCM_FMTBIT_S16_LE, Use tabs please. > +static int nvhdmi_build_pcms(struct hda_codec *codec) > +{ > + struct nvhdmi_spec *spec = codec->spec; > + struct hda_pcm *info = &spec->pcm_rec; > + > + codec->num_pcms = 1; > + codec->pcm_info = info; > + > + info->name = "NVIDIA HDMI"; > + info->pcm_type = HDA_PCM_TYPE_HDMI Ditto. thanks, Takashi

3 5

Re: [alsa-devel] noise and consume pcm faster
by Nie Jun 05 Sep '08

05 Sep '08

It is strange that there is no noise in the first several seconds. It seems like a buffer overflow with too much data accumulated. However, there should not be overflow in playback, right? 2008/9/5 Nie Jun <niej0001(a)gmail.com> > I do not know how these two params will be modified by ALSA lib. It does > not directly accept specified value. > With this cmd: > ./aplay 48k_stero.wav -F5120 -B106400 > I get the nearest setting as following, but still has noise. > > channels: 2 > rate: 48000 (48000/1) > period_size: 248 > buffer_size: 5208 > > > > 2008/9/5 Takashi Iwai <tiwai(a)suse.de> > > At Fri, 5 Sep 2008 14:34:51 +0800, >> Nie Jun wrote: >> > >> > I can not figure out the reason of noise and faster consumption from >> these >> > different. Do you have any idea about these different? Or any other data >> may >> > contain clue? >> >> So, do you mean that the problem persists even if you use the exactly >> same period_size and buffer_size as OSS (i.e. 256 and 5120)? >> >> >> Takashi >> > >

1 0

[alsa-devel] Making envy24control/kenvy24 work on Envy24 HT/HT-S cards
by Vedran Miletić 05 Sep '08

05 Sep '08

Hi, any ideas if it would be possible to make envy24control or kenvy24 work on HT/HT-S cards? I'm referring to VU-meters / mixer / settings / profiles part, not the routing since those chipsets don't support it, according to VIA. -- Vedran Miletić

1 0

Re: [alsa-devel] noise and consume pcm faster
by Takashi Iwai 05 Sep '08

05 Sep '08

At Fri, 5 Sep 2008 14:34:51 +0800, Nie Jun wrote: > > I can not figure out the reason of noise and faster consumption from these > different. Do you have any idea about these different? Or any other data may > contain clue? So, do you mean that the problem persists even if you use the exactly same period_size and buffer_size as OSS (i.e. 256 and 5120)? Takashi

1 0

[alsa-devel] Playing silence instead of pausing during underrun
by Timur Tabi 05 Sep '08

05 Sep '08

If I understand it correctly, when ALSA detects an underrun during playback, it throttles the driver by sending pause and resume commands. It turns out that our hardware doesn't really like this. We're looking at various solutions, but one proposal would be to keep the hardware running during a pause, but just have it play silence instead. That is, ALSA keeps feeding silence data during an underrun recovery. Is there an easy way to do this in ALSA? Is there another driver that does this? -- Timur Tabi Linux kernel developer at Freescale

3 3

Re: [alsa-devel] noise and consume pcm faster
by Nie Jun 05 Sep '08

05 Sep '08

Thank Takashi for your advice. I check /proc/asound/card0/pcm0p/sub0/* files, buffer_sizes of both ALSA and OSS have integer period_size. Maybe other setting causes this issue, but I can not find it. Would you guys please help have a look at these file? Thank you very much! =========== ALSA hw_params =========== access: RW_INTERLEAVED format: S16_LE subformat: STD channels: 2 rate: 48000 (48000/1) period_size: 480 buffer_size: 9600 ----------------- OSS hw_params --------------------- access: RW_INTERLEAVED format: S16_LE subformat: STD channels: 2 rate: 48000 (48000/1) period_size: 256 buffer_size: 5120 OSS format: S16_LE OSS channels: 2 OSS rate: 48000 OSS period bytes: 1024 OSS periods: 20 OSS period frames: 256 =========== ALSA sw_params =========== tstamp_mode: NONE period_step: 1 avail_min: 480 start_threshold: 9600 stop_threshold: 9600 silence_threshold: 0 silence_size: 0 boundary: 1258291200 ----------------- OSS sw_params --------------------- tstamp_mode: NONE period_step: 1 avail_min: 1 start_threshold: 1 stop_threshold: 5120 silence_threshold: 272 silence_size: 272 boundary: 1342177280 =========== ALSA status ========== state: RUNNING trigger_time: 946744218.914947510 tstamp : 946744304.440704346 delay : 8924 avail : 676 avail_max : 1940 ----- hw_ptr : 4105180 appl_ptr : 4114104 ---------------------- OSS status -------------------------- state: RUNNING trigger_time: 946744382.661376953 tstamp : 946744410.868988037 delay : 4908 avail : 212 avail_max : 4876 ----- hw_ptr : 1353952 appl_ptr : 1358860 ============= ALSA OSS has same info ----------------------------- card: 0 device: 0 subdevice: 0 stream: PLAYBACK id: I2S HiFi I2S HiFi-PCM-0 name: subname: subdevice #0 class: 0 subclass: 0 subdevices_count: 1 subdevices_avail: 0 2008/9/3 Takashi Iwai <tiwai(a)suse.de>:- 显示引用文字 -

2 1