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

[alsa-devel] [PATCH] ASoC: dpcm: don't merge format from invalid codec dai
by Jerome Brunet 28 Jun '18

28 Jun '18

When merging codec formats, dpcm_runtime_base_format() should skip the codecs which are not supporting the current stream direction. At the moment, if a BE link has more than one codec, and only one of these codecs has no capture DAI, it becomes impossible to start a capture stream because the merged format would be 0. Skipping invalid codec DAI solves the problem. Fixes: b073ed4e2126 ("ASoC: soc-pcm: DPCM cares BE format") Signed-off-by: Jerome Brunet <jbrunet(a)baylibre.com> --- sound/soc/soc-pcm.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 5141409ccaed..a58d8e7bf52b 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -1694,6 +1694,14 @@ static u64 dpcm_runtime_base_format(struct snd_pcm_substream *substream) int i; for (i = 0; i < be->num_codecs; i++) { + /* + * Skip CODECs which don't support the current stream + * type. See soc_pcm_init_runtime_hw() for more details + */ + if (!snd_soc_dai_stream_valid(be->codec_dais[i], + stream)) + continue; + codec_dai_drv = be->codec_dais[i]->driver; if (stream == SNDRV_PCM_STREAM_PLAYBACK) codec_stream = &codec_dai_drv->playback; -- 2.14.4

2 1

[alsa-devel] [PATCH 0/3] ALSA: PM-related fixes/cleanups
by Takashi Iwai 28 Jun '18

28 Jun '18

Hi, this is a patch set addressing some minor issues found in PM-related stuff, as well as the Intel HDMI fallback issue. The first patch covers the unusual error paths from runtime PM, the second one is a code refactoring and the last one fixes the superfluous (rather harmful) binding with the generic HDMI driver as fallback of i915 component binding. Takashi === Takashi Iwai (3): ALSA: hda - Handle error from snd_hda_power_up*() ALSA: hda - Move in_pm accessors to HDA core ALSA: hda/hdmi - Don't fall back to generic when i915 binding fails include/sound/hdaudio.h | 27 +++++++++++++++++ sound/pci/hda/hda_beep.c | 3 +- sound/pci/hda/hda_codec.c | 25 ++++++---------- sound/pci/hda/hda_controller.c | 4 ++- sound/pci/hda/hda_proc.c | 3 +- sound/pci/hda/hda_sysfs.c | 4 ++- sound/pci/hda/patch_ca0132.c | 53 +++++++++++++++++++++++++++------- sound/pci/hda/patch_hdmi.c | 4 ++- sound/pci/hda/patch_realtek.c | 3 +- 9 files changed, 93 insertions(+), 33 deletions(-) -- 2.17.1

4 14

[alsa-devel] [PATCH] ALSA: hda: Add AZX_DCAPS_PM_RUNTIME for AMD Raven Ridge
by Kai-Heng Feng 28 Jun '18

28 Jun '18

This patch can make audio controller in AMD Raven Ridge gets runtime suspended to D3, to save ~1W power when it's not in use. Cc: Vijendar Mukunda <Vijendar.Mukunda(a)amd.com> Signed-off-by: Kai-Heng Feng <kai.heng.feng(a)canonical.com> --- sound/pci/hda/hda_intel.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 1ae1850b3bfd..a9b55d65f2bd 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -2535,7 +2535,8 @@ static const struct pci_device_id azx_ids[] = { .driver_data = AZX_DRIVER_GENERIC | AZX_DCAPS_PRESET_ATI_SB }, /* AMD Raven */ { PCI_DEVICE(0x1022, 0x15e3), - .driver_data = AZX_DRIVER_GENERIC | AZX_DCAPS_PRESET_ATI_SB }, + .driver_data = AZX_DRIVER_GENERIC | AZX_DCAPS_PRESET_ATI_SB | + AZX_DCAPS_PM_RUNTIME }, /* ATI HDMI */ { PCI_DEVICE(0x1002, 0x0002), .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS }, -- 2.17.1

2 1

[alsa-devel] dsd formats in ALSA plugins
by slava 28 Jun '18

28 Jun '18

Sorry, don't receive my own post, so can't reply Find in alsa-lib-1.1.6 file src/pcm/pcm-params.c line 1945 static const snd_mask_t refine_masks[SND_PCM_HW_PARAM_LAST_MASK - SND_PCM_HW_PARAM_FIRST_MASK + 1] = { [SND_PCM_HW_PARAM_ACCESS - SND_PCM_HW_PARAM_FIRST_MASK] = { .bits = { 0x1f }, }, [SND_PCM_HW_PARAM_FORMAT - SND_PCM_HW_PARAM_FIRST_MASK] = { .bits = { 0x81ffffff, 0xfff}, Change last 0xfff to 0xfffff and now can use DSD formats How i understand, in version 1.0.27 last format = 43 and when new format was added but mask not changed May be i absolutely wrong and what i do has side effects or needed any else? Thanks

2 1

[alsa-devel] [PATCH] Fixed typo on line 733.
by Guy Chronister 28 Jun '18

28 Jun '18

Signed-off-by: Guy Chronister <guylovesbritt(a)gmail.com> --- sound/pci/oxygen/oxygen_mixer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/pci/oxygen/oxygen_mixer.c b/sound/pci/oxygen/oxygen_mixer.c index 81af21a..ba87213 100644 --- a/sound/pci/oxygen/oxygen_mixer.c +++ b/sound/pci/oxygen/oxygen_mixer.c @@ -730,7 +730,7 @@ static int ac97_fp_rec_volume_put(struct snd_kcontrol *ctl, oldreg = oxygen_read_ac97(chip, 1, AC97_REC_GAIN); newreg = oldreg & ~0x0707; newreg = newreg | (value->value.integer.value[0] & 7); - newreg = newreg | ((value->value.integer.value[0] & 7) << 8); + newreg = newreg | ((value->value.integer.value[1] & 7) << 8); change = newreg != oldreg; if (change) oxygen_write_ac97(chip, 1, AC97_REC_GAIN, newreg); -- 2.7.4

2 1

[alsa-devel] [PATCH v2] ALSA: hda/hdmi - Don't fall back to generic when i915 binding fails
by Takashi Iwai 28 Jun '18

28 Jun '18

When i915 component binding fails, it means that HDMI isn't applicable anyway. Although the probe with the generic HDMI parser would still work, it's essentially useless, hence better to be left unbound. This patch mimics the probe_id field at failing the i915 component binding so that the generic HDMI won't be bound after that. Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- v1->v2: use the dummy probe_id value to assure failing the further binding sound/pci/hda/hda_codec.h | 1 + sound/pci/hda/patch_hdmi.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h index a8b1b31f161c..53af948dacea 100644 --- a/sound/pci/hda/hda_codec.h +++ b/sound/pci/hda/hda_codec.h @@ -84,6 +84,7 @@ struct hda_bus { */ typedef int (*hda_codec_patch_t)(struct hda_codec *); +#define HDA_CODEC_ID_SKIP_PROBE 0x00000001 #define HDA_CODEC_ID_GENERIC_HDMI 0x00000101 #define HDA_CODEC_ID_GENERIC 0x00000201 diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index c182e619ad58..31f092abf299 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -2542,6 +2542,8 @@ static int alloc_intel_hdmi(struct hda_codec *codec) /* requires i915 binding */ if (!codec->bus->core.audio_component) { codec_info(codec, "No i915 binding for Intel HDMI/DP codec\n"); + /* set probe_id here to prevent generic fallback binding */ + codec->probe_id = HDA_CODEC_ID_SKIP_PROBE; return -ENODEV; } -- 2.16.4

1 0

[alsa-devel] [PATCH] ALSA: hda - Handle pm failure during hotplug
by Chris Wilson 27 Jun '18

27 Jun '18

Obtaining the runtime pm wakeref can fail, especially in a hotplug scenario where i915.ko has been unloaded. If we do not catch the failure, we end up with an unbalanced pm. References: 222bde03881c ("ALSA: hda - Fix mutex deadlock at HDMI/DP hotplug") Signed-off-by: Chris Wilson <chris(a)chris-wilson.co.uk> Cc: Ville Syrjälä <ville.syrjala(a)linux.intel.com> Cc: Takashi Iwai <tiwai(a)suse.de> Cc: Vinod Koul <vinod.koul(a)intel.com> --- sound/pci/hda/patch_hdmi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index 7d7eb1354eee..3ca98c9fcaee 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -1632,8 +1632,8 @@ static bool hdmi_present_sense(struct hdmi_spec_per_pin *per_pin, int repoll) int ret; /* no temporary power up/down needed for component notifier */ - if (!codec_has_acomp(codec)) - snd_hda_power_up_pm(codec); + if (!codec_has_acomp(codec) && snd_hda_power_up_pm(codec)) + return false; mutex_lock(&spec->pcm_lock); if (codec_has_acomp(codec)) { -- 2.18.0

2 2

[alsa-devel] [PATCH] ALSA: intel_hdmi: Use strlcpy() instead of strncpy()
by Takashi Iwai 27 Jun '18

27 Jun '18

hdmi_lpe_audio_probe() copies the pcm name string via strncpy(), but as a gcc8 warning suggests, it misses a NUL terminator, and unlikely the expected result. Use the proper one, strlcpy() instead. Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/x86/intel_hdmi_audio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/x86/intel_hdmi_audio.c b/sound/x86/intel_hdmi_audio.c index 4ed9d0c41843..edc9f5a34eff 100644 --- a/sound/x86/intel_hdmi_audio.c +++ b/sound/x86/intel_hdmi_audio.c @@ -1854,7 +1854,7 @@ static int hdmi_lpe_audio_probe(struct platform_device *pdev) /* setup private data which can be retrieved when required */ pcm->private_data = ctx; pcm->info_flags = 0; - strncpy(pcm->name, card->shortname, strlen(card->shortname)); + strlcpy(pcm->name, card->shortname, strlen(card->shortname)); /* setup the ops for playabck */ snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &had_pcm_ops); -- 2.17.1

1 0

[alsa-devel] [PATCH tinycompress] cplay: Stop playback stream at the end
by Daniel Baluta 27 Jun '18

27 Jun '18

Each compress_start should have a corresponding compress_stop at the end. Also, this gives user a change to cleanup resources that might have been allocated in compress_start. Signed-off-by: Daniel Baluta <daniel.baluta(a)nxp.com> --- I'm implementing codec library dynamic loading at runtime and I'm exploring using: * SNDRV_COMPRESS_START -> to load the library * SNDRV_COMPRESS_STOP -> to unload the library This might not be the best idea becasue for example loading the library might introduce some delays, anyhow i still think this that compress_stop is correct thing to add at the end of playback. src/utils/cplay.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/utils/cplay.c b/src/utils/cplay.c index 87863a3..3c48d15 100644 --- a/src/utils/cplay.c +++ b/src/utils/cplay.c @@ -403,6 +403,7 @@ void play_samples(char *name, unsigned int card, unsigned int device, printf("%s: exit success\n", __func__); /* issue drain if it supports */ compress_drain(compress); + compress_stop(compress); free(buffer); fclose(file); compress_close(compress); -- 2.7.4

2 3

[alsa-devel] [[PATCH 0/9] ASoC: Intel: bytcr_rt5651: Cleanup (input mapping quirks)
by Hans de Goede 27 Jun '18

27 Jun '18

Hi Mark, This series is mainly a cleanup series. In the beginning of the rt5651 machine driver some wrong assumptions were made, such as the headset mic being attached to IN2 (it is on IN3 on the 7 machines I have access to and on all otherwise known machines). And also adding a quirk for a machine with the intmic on IN2, which later got fixed with a new quirk for machines with 2 internal mics on both IN1 and IN2 and moving the one machine with the IN2 quirk over to the new IN1_IN2 quirk, leaving the IN2 quirk as an orphan quirk for non existing hardware. Then I made a similar mistake adding the IN2_HS_IN3 quirk, while I should have used the IN1_HS_IN3 (which itself only exists because the original IN1 quirk has the headset input mapping wrong), TL;DR: it is a bit of a mess due to a number of wrong assumptions about how the inputs where actually routed in the past. This series cleans this all up in small commits / one bit a time and refers the original commit messages in its commit messages. Note patch 10/11 is not a cleanup patch, but is more or less the reason I took a second look at all the quirks. Regards, Hans

3 22