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

[alsa-devel] Discarding the first few frames inside the kernel
by Ankhit Vivekananda 21 Jan '16

21 Jan '16

Hello All, I am interfacing the ICS43432 MEMS microphone with McBSP interface. The data sheet of the ICS43432 microphone shows that it takes about 4.5ms (16kHz sampling rate) for startup. Because of this, I hear a transient noise at the beginning of every stream. Is there in any way I can discard the frames inside the kernel space itself before reading the samples using snd_pcm_readi() call? I was able to mute the first few frames after the readi() call, but would want to know if I could do it before the readi() call itself inside the kernel space. Appreciate any help! Thanks, Ankhit

2 4

[alsa-devel] [PATCH] ASoC: Intel: Skylake: Fix memory leak
by Sudip Mukherjee 21 Jan '16

21 Jan '16

If snd_soc_tplg_component_load() fails we just printed an error message and returned the error code but we missed releasing the firmware. Signed-off-by: Sudip Mukherjee <sudip(a)vectorindia.org> --- sound/soc/intel/skylake/skl-topology.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/intel/skylake/skl-topology.c b/sound/soc/intel/skylake/skl-topology.c index 4624556..e81c020 100644 --- a/sound/soc/intel/skylake/skl-topology.c +++ b/sound/soc/intel/skylake/skl-topology.c @@ -1510,6 +1510,7 @@ int skl_tplg_init(struct snd_soc_platform *platform, struct hdac_ext_bus *ebus) &skl_tplg_ops, fw, 0); if (ret < 0) { dev_err(bus->dev, "tplg component load failed%d\n", ret); + release_firmware(fw); return -EINVAL; } -- 1.9.1

1 0

[alsa-devel] [PoC] ahwmon: alsa "hw" what-you-hear recorder
by Sergey 21 Jan '16

21 Jan '16

Hello. I needed a tool to test if anything loud is playing right now. So I wrote "ahwmon" - alsa hw monitoring tool. It's based on dmix idea: it gets "hw" shared playback buffer, but reads from the buffer instead of writing. Code is mostly copied from alsa-lib, but it uses kernel /dev/snd/pcm* files directly and doesn't depend on alsa-lib or dmix. May work for other apps playing to "hw", including pulseaudio and jackd. What do you think about it? Can something like this get into alsa-lib or alsa-utils or alsa-plugins? It could be a capture side of "dmix" plugin, which has no capture now. Maybe someone with strong dmix knowledge can port it to dmix? Build: gcc -o ahwmon ahwmon.c Usage: ./ahwmon [-v] [-v] <card_index> <device_index> [<subdevice_index>] subdevice 0 is used by default it outputs .wav stream to stdout Use cases: * Card VUmeter: ./ahwmon 0 0 | aplay -V stereo -D null * Dump what you hear: ./ahwmon 0 0 > audiodump.wav * Duplicate output of one card to another: ./ahwmon 0 0 | aplay -D plughw:1,0 * Stream what you hear to another pc: ./ahwmon 0 0 | nc 192.168.1.10 12345 Known limitations: * supports S16_LE and S32_LE only. * breaks clients attempting to close and reopen "hw" Any ideas are welcome! -- Sergey

2 1

[alsa-devel] FiiO E10k (Digihub USB Audio), occasional system hang.
by Valni 21 Jan '16

21 Jan '16

First off, I apologize if I'm reporting this bug to the wrong list or in the wrong manner; I have never done this before. I've got a Skylake system (kernel 4.3.3-2-ARCH) using Pulseaudio and ALSA which uses a FiiO E10k Olympus 2 (external DAC/AMP) as the soundcard. Very seldom the system will fall to it's knees and ultimately hang, requiring a hard reboot. Checking the system logs gives an error and a dump from alsa-util.c, which is attached to this mail. I'm unsure if there is anymore info that you would need. If more is required, please, do ask.

2 1

[alsa-devel] [PATCH 0/3] ASoC: pcm179x: Add I2C support, declare support for continuous rates
by Jacob Siverskog 21 Jan '16

21 Jan '16

This series add support for I2C and declares support for continuous sample rates. Please note that this has only been tested using I2C and PCM1791A. I'd be grateful if someone can test it with other devices in the PCM179X family and/or SPI. These patches are against linux-next. Jacob Siverskog (3): ASoC: pcm179x: Split into core and SPI parts ASoC: pcm179x: Add I2C interface driver ASoC: pcm179x: Support continuous rates .../devicetree/bindings/sound/pcm179x.txt | 11 ++- sound/soc/codecs/Kconfig | 20 +++++- sound/soc/codecs/Makefile | 4 ++ sound/soc/codecs/pcm179x-i2c.c | 82 ++++++++++++++++++++++ sound/soc/codecs/pcm179x-spi.c | 81 +++++++++++++++++++++ sound/soc/codecs/pcm179x.c | 64 +++-------------- sound/soc/codecs/pcm179x.h | 14 +++- 7 files changed, 215 insertions(+), 61 deletions(-) create mode 100644 sound/soc/codecs/pcm179x-i2c.c create mode 100644 sound/soc/codecs/pcm179x-spi.c -- 2.7.0

4 11

[alsa-devel] [PATCH v2 0/3] ASoC: pcm179x: Add I2C support, declare support for continuous rates
by Jacob Siverskog 20 Jan '16

20 Jan '16

This series add support for I2C and declares support for continuous sample rates. Please note that this has only been tested using I2C and PCM1791A. I'd be grateful if someone can test it with other devices in the PCM179X family and/or SPI. These patches are against linux-next. [V2]: Fix build issues found by kbuild test robot by adding static keyword and proper symbol exports. Jacob Siverskog (3): ASoC: pcm179x: Split into core and SPI parts ASoC: pcm179x: Add I2C interface driver ASoC: pcm179x: Support continuous rates .../devicetree/bindings/sound/pcm179x.txt | 11 ++- sound/soc/codecs/Kconfig | 20 +++++- sound/soc/codecs/Makefile | 4 ++ sound/soc/codecs/pcm179x-i2c.c | 82 ++++++++++++++++++++++ sound/soc/codecs/pcm179x-spi.c | 81 +++++++++++++++++++++ sound/soc/codecs/pcm179x.c | 66 +++-------------- sound/soc/codecs/pcm179x.h | 14 +++- 7 files changed, 217 insertions(+), 61 deletions(-) create mode 100644 sound/soc/codecs/pcm179x-i2c.c create mode 100644 sound/soc/codecs/pcm179x-spi.c -- 2.7.0

3 7

[alsa-devel] [PATCH] ALSA: hda - Flush the pending probe work at remove
by Takashi Iwai 20 Jan '16

20 Jan '16

As HD-audio driver does deferred probe internally via workqueue, the driver might go into the mixed state doing both probe and remove when the module gets unloaded during the probe work. This eventually triggers an Oops, unsurprisingly. For avoiding this race, we just need to flush the pending probe work explicitly before actually starting the resource release. Bugzilla: https://bugzilla.opensuse.org/show_bug.cgi?id=960710 Cc: <stable(a)vger.kernel.org> # v3.17+ Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/pci/hda/hda_intel.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 86bbc6307c4f..256e6cda218f 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -2151,9 +2151,17 @@ i915_power_fail: static void azx_remove(struct pci_dev *pci) { struct snd_card *card = pci_get_drvdata(pci); + struct azx *chip; + struct hda_intel *hda; + + if (card) { + /* flush the pending probing work */ + chip = card->private_data; + hda = container_of(chip, struct hda_intel, chip); + flush_work(&hda->probe_work); - if (card) snd_card_free(card); + } } static void azx_shutdown(struct pci_dev *pci) -- 2.7.0

1 0

[alsa-devel] [PATCH 2/2] ALSA: hda - Fix missing module loading with model=generic option
by Takashi Iwai 20 Jan '16

20 Jan '16

When the generic codec driver is specified via model option or such, the hda driver doesn't try to load the generic driver module but still loads the codec-specific driver, and this ends up with the binding failure. This patch fixes it by moving the generic module request in the common helper code. Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=111021 Cc: <stable(a)vger.kernel.org> # v4.4+ Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/pci/hda/hda_bind.c | 42 ++++++++++++++++++++++++++++++++---------- 1 file changed, 32 insertions(+), 10 deletions(-) diff --git a/sound/pci/hda/hda_bind.c b/sound/pci/hda/hda_bind.c index 70671ad65d24..6efadbfb3fe3 100644 --- a/sound/pci/hda/hda_bind.c +++ b/sound/pci/hda/hda_bind.c @@ -174,14 +174,40 @@ static inline bool codec_probed(struct hda_codec *codec) return device_attach(hda_codec_dev(codec)) > 0 && codec->preset; } -/* try to auto-load and bind the codec module */ -static void codec_bind_module(struct hda_codec *codec) +/* try to auto-load codec module */ +static void request_codec_module(struct hda_codec *codec) { #ifdef MODULE char modalias[32]; + const char *mod = NULL; + + switch (codec->probe_id) { + case HDA_CODEC_ID_GENERIC_HDMI: +#if IS_MODULE(CONFIG_SND_HDA_CODEC_HDMI) + mod = "snd-hda-codec-hdmi"; +#endif + break; + case HDA_CODEC_ID_GENERIC: +#if IS_MODULE(CONFIG_SND_HDA_GENERIC) + mod = "snd-hda-codec-generic"; +#endif + break; + default: + snd_hdac_codec_modalias(&codec->core, modalias, sizeof(modalias)); + mod = modalias; + break; + } + + if (mod) + request_module(mod); +#endif /* MODULE */ +} - snd_hdac_codec_modalias(&codec->core, modalias, sizeof(modalias)); - request_module(modalias); +/* try to auto-load and bind the codec module */ +static void codec_bind_module(struct hda_codec *codec) +{ +#ifdef MODULE + request_codec_module(codec); if (codec_probed(codec)) return; #endif @@ -218,17 +244,13 @@ static int codec_bind_generic(struct hda_codec *codec) if (is_likely_hdmi_codec(codec)) { codec->probe_id = HDA_CODEC_ID_GENERIC_HDMI; -#if IS_MODULE(CONFIG_SND_HDA_CODEC_HDMI) - request_module("snd-hda-codec-hdmi"); -#endif + request_codec_module(codec); if (codec_probed(codec)) return 0; } codec->probe_id = HDA_CODEC_ID_GENERIC; -#if IS_MODULE(CONFIG_SND_HDA_GENERIC) - request_module("snd-hda-codec-generic"); -#endif + request_codec_module(codec); if (codec_probed(codec)) return 0; return -ENODEV; -- 2.7.0

1 1

[alsa-devel] [PATCH - alsa-lib 1/1] removing surround PCMs built with ttable
by tom.ty89＠gmail.com 20 Jan '16

20 Jan '16

From: Tom Yan <tom.ty89(a)gmail.com> Removing surround41 and surround50. surround21 stays untouched because it was added particularly for laptops with subwoofer speaker recently. Though i do think that those should be handled with a more specifc and proper approach, if the conf has really ever worked for them. Signed-off-by: Tom Yan <tom.ty89(a)gmail.com> diff --git a/src/conf/alsa.conf b/src/conf/alsa.conf index f22918f..d1ba9f5 100644 --- a/src/conf/alsa.conf +++ b/src/conf/alsa.conf @@ -94,10 +94,6 @@ defaults.pcm.surround21.card defaults.pcm.card defaults.pcm.surround21.device defaults.pcm.device defaults.pcm.surround40.card defaults.pcm.card defaults.pcm.surround40.device defaults.pcm.device -defaults.pcm.surround41.card defaults.pcm.card -defaults.pcm.surround41.device defaults.pcm.device -defaults.pcm.surround50.card defaults.pcm.card -defaults.pcm.surround50.device defaults.pcm.device defaults.pcm.surround51.card defaults.pcm.card defaults.pcm.surround51.device defaults.pcm.device defaults.pcm.surround71.card defaults.pcm.card @@ -135,8 +131,6 @@ pcm.center_lfe cards.pcm.center_lfe pcm.side cards.pcm.side pcm.surround21 cards.pcm.surround21 pcm.surround40 cards.pcm.surround40 -pcm.surround41 cards.pcm.surround41 -pcm.surround50 cards.pcm.surround50 pcm.surround51 cards.pcm.surround51 pcm.surround71 cards.pcm.surround71 pcm.iec958 cards.pcm.iec958 diff --git a/src/conf/cards/ATIIXP-SPDMA.conf b/src/conf/cards/ATIIXP-SPDMA.conf index 42540d6..eb01ebb 100644 --- a/src/conf/cards/ATIIXP-SPDMA.conf +++ b/src/conf/cards/ATIIXP-SPDMA.conf @@ -78,8 +78,6 @@ ATIIXP-SPDMA.pcm.surround40.0 { } <confdir:pcm/surround21.conf> -<confdir:pcm/surround41.conf> -<confdir:pcm/surround50.conf> <confdir:pcm/surround51.conf> ATIIXP-SPDMA.pcm.surround51.0 { diff --git a/src/conf/cards/ATIIXP.conf b/src/conf/cards/ATIIXP.conf index c4d33ef..1db6bd1 100644 --- a/src/conf/cards/ATIIXP.conf +++ b/src/conf/cards/ATIIXP.conf @@ -78,8 +78,6 @@ ATIIXP.pcm.surround40.0 { } <confdir:pcm/surround21.conf> -<confdir:pcm/surround41.conf> -<confdir:pcm/surround50.conf> <confdir:pcm/surround51.conf> ATIIXP.pcm.surround51.0 { diff --git a/src/conf/cards/Audigy.conf b/src/conf/cards/Audigy.conf index 1c92496..dadb7be 100644 --- a/src/conf/cards/Audigy.conf +++ b/src/conf/cards/Audigy.conf @@ -145,8 +145,6 @@ Audigy.pcm.center_lfe.0 { <confdir:pcm/surround21.conf> <confdir:pcm/surround40.conf> -<confdir:pcm/surround41.conf> -<confdir:pcm/surround50.conf> Audigy.pcm.surround40.0 { @args [ CARD ] diff --git a/src/conf/cards/Audigy2.conf b/src/conf/cards/Audigy2.conf index cbec783..24d55e1 100644 --- a/src/conf/cards/Audigy2.conf +++ b/src/conf/cards/Audigy2.conf @@ -197,8 +197,6 @@ Audigy2.pcm.side.0 { <confdir:pcm/surround21.conf> <confdir:pcm/surround40.conf> -<confdir:pcm/surround41.conf> -<confdir:pcm/surround50.conf> Audigy2.pcm.surround40.0 { @args [ CARD ] diff --git a/src/conf/cards/Aureon51.conf b/src/conf/cards/Aureon51.conf index 07be4a7..11fd424 100644 --- a/src/conf/cards/Aureon51.conf +++ b/src/conf/cards/Aureon51.conf @@ -87,8 +87,6 @@ Aureon51.pcm.surround40.0 { } <confdir:pcm/surround21.conf> -<confdir:pcm/surround41.conf> -<confdir:pcm/surround50.conf> <confdir:pcm/surround51.conf> Aureon51.pcm.surround51.0 { diff --git a/src/conf/cards/Aureon71.conf b/src/conf/cards/Aureon71.conf index a43ce2c..36dae9b 100644 --- a/src/conf/cards/Aureon71.conf +++ b/src/conf/cards/Aureon71.conf @@ -87,8 +87,6 @@ Aureon71.pcm.surround40.0 { } <confdir:pcm/surround21.conf> -<confdir:pcm/surround41.conf> -<confdir:pcm/surround50.conf> <confdir:pcm/surround51.conf> Aureon71.pcm.surround51.0 { diff --git a/src/conf/cards/CA0106.conf b/src/conf/cards/CA0106.conf index 2f0eaf0..78e460f 100644 --- a/src/conf/cards/CA0106.conf +++ b/src/conf/cards/CA0106.conf @@ -109,8 +109,6 @@ CA0106.pcm.surround40.0 { } <confdir:pcm/surround21.conf> -<confdir:pcm/surround41.conf> -<confdir:pcm/surround50.conf> <confdir:pcm/surround51.conf> <confdir:pcm/surround71.conf> diff --git a/src/conf/cards/CMI8738-MC6.conf b/src/conf/cards/CMI8738-MC6.conf index edc67d4..fa043f1 100644 --- a/src/conf/cards/CMI8738-MC6.conf +++ b/src/conf/cards/CMI8738-MC6.conf @@ -78,8 +78,6 @@ CMI8738-MC6.pcm.surround40.0 { } <confdir:pcm/surround21.conf> -<confdir:pcm/surround41.conf> -<confdir:pcm/surround50.conf> <confdir:pcm/surround51.conf> CMI8738-MC6.pcm.surround51.0 { diff --git a/src/conf/cards/CMI8738-MC8.conf b/src/conf/cards/CMI8738-MC8.conf index ddff753..b46cda3 100644 --- a/src/conf/cards/CMI8738-MC8.conf +++ b/src/conf/cards/CMI8738-MC8.conf @@ -106,8 +106,6 @@ CMI8738-MC8.pcm.surround40.0 { <confdir:pcm/surround21.conf> -<confdir:pcm/surround41.conf> -<confdir:pcm/surround50.conf> <confdir:pcm/surround51.conf> CMI8738-MC8.pcm.surround51.0 { diff --git a/src/conf/cards/CMI8788.conf b/src/conf/cards/CMI8788.conf index edcb0c9..cb7d2d8 100644 --- a/src/conf/cards/CMI8788.conf +++ b/src/conf/cards/CMI8788.conf @@ -49,8 +49,6 @@ CMI8788.pcm.surround40.0 { } <confdir:pcm/surround21.conf> -<confdir:pcm/surround41.conf> -<confdir:pcm/surround50.conf> <confdir:pcm/surround51.conf> CMI8788.pcm.surround51.0 { diff --git a/src/conf/cards/CS46xx.conf b/src/conf/cards/CS46xx.conf index b71c30a..1587f36 100644 --- a/src/conf/cards/CS46xx.conf +++ b/src/conf/cards/CS46xx.conf @@ -113,8 +113,6 @@ CS46xx.pcm.surround40.0 { } <confdir:pcm/surround21.conf> -<confdir:pcm/surround41.conf> -<confdir:pcm/surround50.conf> <confdir:pcm/surround51.conf> CS46xx.pcm.surround51.0 { diff --git a/src/conf/cards/EMU10K1.conf b/src/conf/cards/EMU10K1.conf index ef193fe..bc46e49 100644 --- a/src/conf/cards/EMU10K1.conf +++ b/src/conf/cards/EMU10K1.conf @@ -218,8 +218,6 @@ EMU10K1.pcm.surround40.0 { } <confdir:pcm/surround21.conf> -<confdir:pcm/surround41.conf> -<confdir:pcm/surround50.conf> <confdir:pcm/surround51.conf> EMU10K1.pcm.surround51.0 { diff --git a/src/conf/cards/EMU10K1X.conf b/src/conf/cards/EMU10K1X.conf index f742863..1538ae1 100644 --- a/src/conf/cards/EMU10K1X.conf +++ b/src/conf/cards/EMU10K1X.conf @@ -97,8 +97,6 @@ EMU10K1X.pcm.surround40.0 { } <confdir:pcm/surround21.conf> -<confdir:pcm/surround41.conf> -<confdir:pcm/surround50.conf> <confdir:pcm/surround51.conf> EMU10K1X.pcm.surround51.0 { diff --git a/src/conf/cards/Echo_Echo3G.conf b/src/conf/cards/Echo_Echo3G.conf index 766f13f..1ceda41 100644 --- a/src/conf/cards/Echo_Echo3G.conf +++ b/src/conf/cards/Echo_Echo3G.conf @@ -85,96 +85,6 @@ Echo_Echo3G.pcm.surround40.0 { ] } -<confdir:pcm/surround41.conf> -Echo_Echo3G.pcm.surround41.0 { - @args [ CARD ] - @args.CARD { - type string - } - type multi - slaves [ - { - pcm { - @func concat - strings [ - "cards.Echo_Echo3G.pcm.front.0:CARD=" $CARD - ] - } - channels 2 - } - { - pcm { - @func concat - strings [ - "cards.Echo_Echo3G.pcm.rear.0:CARD=" $CARD - ] - } - channels 2 - } - { - pcm { - @func concat - strings [ - "cards.Echo_Echo3G.pcm.center_lfe.0:CARD=" $CARD - ] - } - channels 2 - } - ] - bindings [ - { slave 0 channel 0 } - { slave 0 channel 1 } - { slave 1 channel 0 } - { slave 1 channel 1 } - { slave 2 channel 0 } - ] -} - -<confdir:pcm/surround50.conf> -Echo_Echo3G.pcm.surround50.0 { - @args [ CARD ] - @args.CARD { - type string - } - type multi - slaves [ - { - pcm { - @func concat - strings [ - "cards.Echo_Echo3G.pcm.front.0:CARD=" $CARD - ] - } - channels 2 - } - { - pcm { - @func concat - strings [ - "cards.Echo_Echo3G.pcm.rear.0:CARD=" $CARD - ] - } - channels 2 - } - { - pcm { - @func concat - strings [ - "cards.Echo_Echo3G.pcm.center_lfe.0:CARD=" $CARD - ] - } - channels 2 - } - ] - bindings [ - { slave 0 channel 0 } - { slave 0 channel 1 } - { slave 1 channel 0 } - { slave 1 channel 1 } - { slave 2 channel 1 } - ] -} - <confdir:pcm/surround51.conf> Echo_Echo3G.pcm.surround51.0 { @args [ CARD ] diff --git a/src/conf/cards/FM801.conf b/src/conf/cards/FM801.conf index 0ddf799..9418303 100644 --- a/src/conf/cards/FM801.conf +++ b/src/conf/cards/FM801.conf @@ -41,8 +41,6 @@ FM801.pcm.default { FM801.pcm.surround40.0 "cards.FM801.pcm.front.0" <confdir:pcm/surround21.conf> -<confdir:pcm/surround41.conf> -<confdir:pcm/surround50.conf> <confdir:pcm/surround51.conf> FM801.pcm.surround51.0 "cards.FM801.pcm.front.0" diff --git a/src/conf/cards/FireWave.conf b/src/conf/cards/FireWave.conf index fcfc83c..1305e20 100644 --- a/src/conf/cards/FireWave.conf +++ b/src/conf/cards/FireWave.conf @@ -26,8 +26,6 @@ FireWave.pcm.front.0 { } <confdir:pcm/surround21.conf> -<confdir:pcm/surround41.conf> -<confdir:pcm/surround50.conf> <confdir:pcm/surround51.conf> FireWave.pcm.surround51.0 { diff --git a/src/conf/cards/HDA-Intel.conf b/src/conf/cards/HDA-Intel.conf index fa9f694..f96cc4c 100644 --- a/src/conf/cards/HDA-Intel.conf +++ b/src/conf/cards/HDA-Intel.conf @@ -73,8 +73,6 @@ HDA-Intel.pcm.default { <confdir:pcm/surround21.conf> <confdir:pcm/surround40.conf> -<confdir:pcm/surround41.conf> -<confdir:pcm/surround50.conf> <confdir:pcm/surround51.conf> <confdir:pcm/surround71.conf> diff --git a/src/conf/cards/ICE1712.conf b/src/conf/cards/ICE1712.conf index db62684..b3ba596 100644 --- a/src/conf/cards/ICE1712.conf +++ b/src/conf/cards/ICE1712.conf @@ -75,8 +75,6 @@ ICE1712.pcm.surround40.0 { } <confdir:pcm/surround21.conf> -<confdir:pcm/surround41.conf> -<confdir:pcm/surround50.conf> <confdir:pcm/surround51.conf> <confdir:pcm/surround71.conf> diff --git a/src/conf/cards/ICE1724.conf b/src/conf/cards/ICE1724.conf index 61cac01..7cabe6e 100644 --- a/src/conf/cards/ICE1724.conf +++ b/src/conf/cards/ICE1724.conf @@ -96,8 +96,6 @@ ICE1724.pcm.surround40.0 { } <confdir:pcm/surround21.conf> -<confdir:pcm/surround41.conf> -<confdir:pcm/surround50.conf> <confdir:pcm/surround51.conf> ICE1724.pcm.surround51.0 { diff --git a/src/conf/cards/ICH.conf b/src/conf/cards/ICH.conf index 6fc9a5a..f348d6f 100644 --- a/src/conf/cards/ICH.conf +++ b/src/conf/cards/ICH.conf @@ -99,8 +99,6 @@ ICH.pcm.surround40.0 { } <confdir:pcm/surround21.conf> -<confdir:pcm/surround41.conf> -<confdir:pcm/surround50.conf> <confdir:pcm/surround51.conf> ICH.pcm.surround51.0 { diff --git a/src/conf/cards/ICH4.conf b/src/conf/cards/ICH4.conf index 64ec883..c9d0895 100644 --- a/src/conf/cards/ICH4.conf +++ b/src/conf/cards/ICH4.conf @@ -99,8 +99,6 @@ ICH4.pcm.surround40.0 { } <confdir:pcm/surround21.conf> -<confdir:pcm/surround41.conf> -<confdir:pcm/surround50.conf> <confdir:pcm/surround51.conf> ICH4.pcm.surround51.0 { diff --git a/src/conf/cards/Loopback.conf b/src/conf/cards/Loopback.conf index 1ae6d45..d3e7f8a 100644 --- a/src/conf/cards/Loopback.conf +++ b/src/conf/cards/Loopback.conf @@ -65,8 +65,6 @@ Loopback.pcm.default { <confdir:pcm/surround21.conf> <confdir:pcm/surround40.conf> -<confdir:pcm/surround41.conf> -<confdir:pcm/surround50.conf> <confdir:pcm/surround51.conf> <confdir:pcm/surround71.conf> diff --git a/src/conf/cards/NFORCE.conf b/src/conf/cards/NFORCE.conf index 64d1547..fd236c6 100644 --- a/src/conf/cards/NFORCE.conf +++ b/src/conf/cards/NFORCE.conf @@ -99,8 +99,6 @@ NFORCE.pcm.surround40.0 { } <confdir:pcm/surround21.conf> -<confdir:pcm/surround41.conf> -<confdir:pcm/surround50.conf> <confdir:pcm/surround51.conf> NFORCE.pcm.surround51.0 { diff --git a/src/conf/cards/SB-XFi.conf b/src/conf/cards/SB-XFi.conf index eb2218b..2cce159 100644 --- a/src/conf/cards/SB-XFi.conf +++ b/src/conf/cards/SB-XFi.conf @@ -55,8 +55,6 @@ SB-XFi.pcm.side.0 { <confdir:pcm/surround21.conf> <confdir:pcm/surround40.conf> -<confdir:pcm/surround41.conf> -<confdir:pcm/surround50.conf> <confdir:pcm/surround51.conf> <confdir:pcm/surround71.conf> diff --git a/src/conf/cards/SI7018.conf b/src/conf/cards/SI7018.conf index 02b8fc8..cba7eaa 100644 --- a/src/conf/cards/SI7018.conf +++ b/src/conf/cards/SI7018.conf @@ -79,8 +79,6 @@ SI7018.pcm.surround40.0 { } <confdir:pcm/surround21.conf> -<confdir:pcm/surround41.conf> -<confdir:pcm/surround50.conf> <confdir:pcm/surround51.conf> SI7018.pcm.surround51.0 { diff --git a/src/conf/cards/USB-Audio.conf b/src/conf/cards/USB-Audio.conf index e365f29..0533fb8 100644 --- a/src/conf/cards/USB-Audio.conf +++ b/src/conf/cards/USB-Audio.conf @@ -329,8 +329,6 @@ USB-Audio.pcm.surround40_two_stereo_devices { } <confdir:pcm/surround21.conf> -<confdir:pcm/surround41.conf> -<confdir:pcm/surround50.conf> <confdir:pcm/surround51.conf> USB-Audio.pcm.surround51.0 { diff --git a/src/conf/cards/VIA8233.conf b/src/conf/cards/VIA8233.conf index 9ad321f..1da835f 100644 --- a/src/conf/cards/VIA8233.conf +++ b/src/conf/cards/VIA8233.conf @@ -87,8 +87,6 @@ VIA8233.pcm.surround40.0 { } <confdir:pcm/surround21.conf> -<confdir:pcm/surround41.conf> -<confdir:pcm/surround50.conf> <confdir:pcm/surround51.conf> VIA8233.pcm.surround51.0 { diff --git a/src/conf/cards/VIA8233A.conf b/src/conf/cards/VIA8233A.conf index 679fccf..5239dc5 100644 --- a/src/conf/cards/VIA8233A.conf +++ b/src/conf/cards/VIA8233A.conf @@ -85,8 +85,6 @@ VIA8233A.pcm.surround40.0 { } <confdir:pcm/surround21.conf> -<confdir:pcm/surround41.conf> -<confdir:pcm/surround50.conf> <confdir:pcm/surround51.conf> VIA8233A.pcm.surround51.0 { diff --git a/src/conf/cards/VIA8237.conf b/src/conf/cards/VIA8237.conf index 29d8e00..566609b 100644 --- a/src/conf/cards/VIA8237.conf +++ b/src/conf/cards/VIA8237.conf @@ -80,8 +80,6 @@ VIA8237.pcm.surround40.0 { } <confdir:pcm/surround21.conf> -<confdir:pcm/surround41.conf> -<confdir:pcm/surround50.conf> <confdir:pcm/surround51.conf> VIA8237.pcm.surround51.0 { diff --git a/src/conf/pcm/Makefile.am b/src/conf/pcm/Makefile.am index c548660..ca43006 100644 --- a/src/conf/pcm/Makefile.am +++ b/src/conf/pcm/Makefile.am @@ -1,7 +1,7 @@ cfg_files = default.conf front.conf rear.conf center_lfe.conf side.conf\ - surround21.conf surround40.conf surround41.conf \ - surround50.conf surround51.conf \ - surround71.conf iec958.conf hdmi.conf modem.conf \ + surround21.conf surround40.conf \ + surround51.conf surround71.conf \ + iec958.conf hdmi.conf modem.conf \ dmix.conf dsnoop.conf \ dpl.conf diff --git a/src/conf/pcm/surround41.conf b/src/conf/pcm/surround41.conf deleted file mode 100644 index 2f82381..0000000 --- a/src/conf/pcm/surround41.conf +++ /dev/null @@ -1,65 +0,0 @@ -# -# Hardware output from 4.1 speakers. -# Samples must be positioned: -# chn0 - front left -# chn1 - front right -# chn2 - rear left -# chn3 - rear right -# chn4 - LFE -# - -pcm.!surround41 { - @args [ CARD DEV ] - @args.CARD { - type string - default { - @func getenv - vars [ - ALSA_SURROUND41_CARD - ALSA_PCM_CARD - ALSA_CARD - ] - default { - @func refer - name defaults.pcm.surround41.card - } - } - } - @args.DEV { - type integer - default { - @func igetenv - vars [ - ALSA_SURROUND41_DEVICE - ] - default { - @func refer - name defaults.pcm.surround41.device - } - } - } - type route - slave.pcm { - @func refer - name { - @func concat - strings [ - "cards." - { - @func card_driver - card $CARD - } - ".pcm.surround51." $DEV ":CARD=" $CARD - ] - } - } - ttable.0.FL 1 - ttable.1.FR 1 - ttable.2.RL 1 - ttable.3.RR 1 - ttable.4.LFE 1 - hint { - description "4.1 Surround output to Front, Rear and Subwoofer speakers" - device $DEV - } -} diff --git a/src/conf/pcm/surround50.conf b/src/conf/pcm/surround50.conf deleted file mode 100644 index dc95c17..0000000 --- a/src/conf/pcm/surround50.conf +++ /dev/null @@ -1,65 +0,0 @@ -# -# Hardware output from 5.0 speakers. -# Samples must be positioned: -# chn0 - front left -# chn1 - front right -# chn2 - rear left -# chn3 - rear right -# chn4 - center -# - -pcm.!surround50 { - @args [ CARD DEV ] - @args.CARD { - type string - default { - @func getenv - vars [ - ALSA_SURROUND50_CARD - ALSA_PCM_CARD - ALSA_CARD - ] - default { - @func refer - name defaults.pcm.surround50.card - } - } - } - @args.DEV { - type integer - default { - @func igetenv - vars [ - ALSA_SURROUND50_DEVICE - ] - default { - @func refer - name defaults.pcm.surround50.device - } - } - } - type route - slave.pcm { - @func refer - name { - @func concat - strings [ - "cards." - { - @func card_driver - card $CARD - } - ".pcm.surround51." $DEV ":CARD=" $CARD - ] - } - } - ttable.0.FL 1 - ttable.1.FR 1 - ttable.2.RL 1 - ttable.3.RR 1 - ttable.4.FC 1 - hint { - description "5.0 Surround output to Front, Center and Rear speakers" - device $DEV - } -} -- 2.7.0

2 1

[alsa-devel] [RFC 0/6] sti: add audio interface to the hdmi driver
by Arnaud Pouliquen 20 Jan '16

20 Jan '16

This patch-set is implementation of audio HDMI on sti platform based on generic hdmi-codec driver proposed by Jyri Sarha. https://patchwork.kernel.org/patch/7215271/ ("ASoC: hdmi-codec: Add hdmi-codec for external HDMI-encoders") hdmi-codec is compatible with STi implementation. In addition i have listed below two features that seem missing: 1) IEC958 channel status control support. If channel status is handled by HDMI codec, it needs also to support IEC61937 format for none PCM stream. In this case a control shall be created to allows user to set the expected mode, and associated parameters. Another constraint is that this control should be linked to PCM device to support as example a SPDIF and a HDMI out with 2 separate controls. In this patch set I propose an implementation to support it: - ALSA: pcm: add IEC958 channel status control helper add generic function to control and handle IEC controls customer and professional mask controls could be added if needed... - ASoC: core: add code to complete dai init after pcm creation Add a callback in snd_soc_dai_ops to allow to link DAI controls to PCM device 2) HDMI Audio info frame speaker mapping. To be HDMI 1.4b compliant AIF speaker channel allocation (byte 4) needs to be set for PCM streams, that contain more than 2 channels. omap2 driver set hard-coded value for stereo, 5.1 and 7.1. But This information should be provided by user that decodes the stream. I did not implement it but what about a generic CEA861 control to support the feature? To finish I'm still interested in having your feed back on patch that propose a generic implementation to compute N and CTS... Arnaud Pouliquen (6): video: hdmi: add helper function for N and CTS ALSA: pcm: add IEC958 channel status control helper ASoC: core: add code to complete dai init after pcm creation drm: sti: Add ASoC generic hdmi codec support. ASoc: hdmi-codec: add IEC control. ARM: DT: b2120: add audio HDMI dai link in audio card arch/arm/boot/dts/stihxxx-b2120.dtsi | 15 ++- drivers/gpu/drm/sti/Kconfig | 1 + drivers/gpu/drm/sti/sti_hdmi.c | 253 ++++++++++++++++++++++++++++++++--- drivers/gpu/drm/sti/sti_hdmi.h | 10 ++ drivers/video/hdmi.c | 146 ++++++++++++++++++++ include/linux/hdmi.h | 11 ++ include/sound/hdmi-codec.h | 1 + include/sound/pcm_iec958.h | 16 +++ include/sound/soc-dai.h | 7 + sound/core/pcm_iec958.c | 90 +++++++++++++ sound/soc/codecs/hdmi-codec.c | 59 ++++++-- sound/soc/soc-core.c | 14 ++ 12 files changed, 591 insertions(+), 32 deletions(-) -- 1.9.1

3 13