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

[alsa-devel] [PATCH] ASoC: SOF: imx8: Fix an is IS_ERR() vs NULL check
by Dan Carpenter 27 Aug '19

27 Aug '19

The device_link_add() function only returns NULL on error, it doesn't return error pointers. Fixes: 202acc565a1f ("ASoC: SOF: imx: Add i.MX8 HW support") Signed-off-by: Dan Carpenter <dan.carpenter(a)oracle.com> --- sound/soc/sof/imx/imx8.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/sof/imx/imx8.c b/sound/soc/sof/imx/imx8.c index e502f584207f..41ad3a310808 100644 --- a/sound/soc/sof/imx/imx8.c +++ b/sound/soc/sof/imx/imx8.c @@ -227,8 +227,8 @@ static int imx8_probe(struct snd_sof_dev *sdev) DL_FLAG_STATELESS | DL_FLAG_PM_RUNTIME | DL_FLAG_RPM_ACTIVE); - if (IS_ERR(priv->link[i])) { - ret = PTR_ERR(priv->link[i]); + if (!priv->link[i]) { + ret = -ENOMEM; dev_pm_domain_detach(priv->pd_dev[i], false); goto exit_unroll_pm; } -- 2.20.1

3 2

[alsa-devel] [PATCH -next] ASoC: SOF: imx8: Fix return value check in imx8_probe()
by Wei Yongjun 27 Aug '19

27 Aug '19

In case of error, the function devm_ioremap_wc() returns NULL pointer not ERR_PTR(). The IS_ERR() test in the return value check should be replaced with NULL test. Fixes: 202acc565a1f ("ASoC: SOF: imx: Add i.MX8 HW support") Signed-off-by: Wei Yongjun <weiyongjun1(a)huawei.com> --- sound/soc/sof/imx/imx8.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/sof/imx/imx8.c b/sound/soc/sof/imx/imx8.c index e502f584207f..263d4df35fe8 100644 --- a/sound/soc/sof/imx/imx8.c +++ b/sound/soc/sof/imx/imx8.c @@ -296,10 +296,10 @@ static int imx8_probe(struct snd_sof_dev *sdev) sdev->bar[SOF_FW_BLK_TYPE_SRAM] = devm_ioremap_wc(sdev->dev, res.start, res.end - res.start + 1); - if (IS_ERR(sdev->bar[SOF_FW_BLK_TYPE_SRAM])) { + if (!sdev->bar[SOF_FW_BLK_TYPE_SRAM]) { dev_err(sdev->dev, "failed to ioremap mem 0x%x size 0x%x\n", base, size); - ret = PTR_ERR(sdev->bar[SOF_FW_BLK_TYPE_SRAM]); + ret = -ENOMEM; goto exit_pdev_unregister; } sdev->mailbox_bar = SOF_FW_BLK_TYPE_SRAM;

3 2

[alsa-devel] [PATCH] ASoC: mediatek: mt8183: remove unused DAPM-related variables
by Tzung-Bi Shih 27 Aug '19

27 Aug '19

Remove unused variable mt8183_mt6358_ts3a227_max98357_dapm_widgets and mt8183_mt6358_ts3a227_max98357_dapm_routes. They are accidentially included when rebasing commits. Fixes: 6191cbde5ff0 ("ASoC: mediatek: mt8183: switch tdm pins gpio function when playback on or off") Signed-off-by: Tzung-Bi Shih <tzungbi(a)google.com> --- .../mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c b/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c index fe8a7461ace5..951706fa75fc 100644 --- a/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c +++ b/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c @@ -46,16 +46,6 @@ static int mt8183_i2s_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, return 0; } -static const struct snd_soc_dapm_widget -mt8183_mt6358_ts3a227_max98357_dapm_widgets[] = { - SND_SOC_DAPM_OUTPUT("IT6505_8CH"), -}; - -static const struct snd_soc_dapm_route -mt8183_mt6358_ts3a227_max98357_dapm_routes[] = { - {"IT6505_8CH", NULL, "TDM"}, -}; - enum PINCTRL_PIN_STATE { PIN_STATE_DEFAULT = 0, PIN_TDM_OUT_ON, -- 2.23.0.187.g17f5b7556c-goog

2 1

[alsa-devel] [PATCH v2 1/2] ASoC: es8316: fix headphone mixer volume table
by Katsuhiro Suzuki 27 Aug '19

27 Aug '19

This patch fix setting table of Headphone mixer volume. Current code uses 4 ... 7 values but these values are prohibited. Correct settings are the following: 0000 -12dB 0001 -10.5dB 0010 -9dB 0011 -7.5dB 0100 -6dB 1000 -4.5dB 1001 -3dB 1010 -1.5dB 1011 0dB Signed-off-by: Katsuhiro Suzuki <katsuhiro(a)katsuster.net> --- sound/soc/codecs/es8316.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/es8316.c b/sound/soc/codecs/es8316.c index 8dfb5dbeebbf..f97d9c5210f0 100644 --- a/sound/soc/codecs/es8316.c +++ b/sound/soc/codecs/es8316.c @@ -53,7 +53,10 @@ static const SNDRV_CTL_TLVD_DECLARE_DB_SCALE(adc_vol_tlv, -9600, 50, 1); static const SNDRV_CTL_TLVD_DECLARE_DB_SCALE(alc_max_gain_tlv, -650, 150, 0); static const SNDRV_CTL_TLVD_DECLARE_DB_SCALE(alc_min_gain_tlv, -1200, 150, 0); static const SNDRV_CTL_TLVD_DECLARE_DB_SCALE(alc_target_tlv, -1650, 150, 0); -static const SNDRV_CTL_TLVD_DECLARE_DB_SCALE(hpmixer_gain_tlv, -1200, 150, 0); +static const SNDRV_CTL_TLVD_DECLARE_DB_RANGE(hpmixer_gain_tlv, + 0, 4, TLV_DB_SCALE_ITEM(-1200, 150, 0), + 8, 11, TLV_DB_SCALE_ITEM(-450, 150, 0), +); static const SNDRV_CTL_TLVD_DECLARE_DB_RANGE(adc_pga_gain_tlv, 0, 0, TLV_DB_SCALE_ITEM(-350, 0, 0), @@ -91,7 +94,7 @@ static const struct snd_kcontrol_new es8316_snd_controls[] = { SOC_DOUBLE_TLV("Headphone Playback Volume", ES8316_CPHP_ICAL_VOL, 4, 0, 3, 1, hpout_vol_tlv), SOC_DOUBLE_TLV("Headphone Mixer Volume", ES8316_HPMIX_VOL, - 0, 4, 7, 0, hpmixer_gain_tlv), + 0, 4, 11, 0, hpmixer_gain_tlv), SOC_ENUM("Playback Polarity", dacpol), SOC_DOUBLE_R_TLV("DAC Playback Volume", ES8316_DAC_VOLL, -- 2.23.0.rc1

3 5

[alsa-devel] [PATCH 1/2] ASoC: rt1011: add mutex protection to set_fmt/set_tdm_slot
by shumingf＠realtek.com 27 Aug '19

27 Aug '19

From: Shuming Fan <shumingf(a)realtek.com> The calibration process at booting will reset registers and bypass cache to make sure the calibration is done. We add mutex protection to avoid unexpected settings while the registration process and calibration are interleaved. Signed-off-by: Shuming Fan <shumingf(a)realtek.com> --- sound/soc/codecs/rt1011.c | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/sound/soc/codecs/rt1011.c b/sound/soc/codecs/rt1011.c index fa34565a3938..f9235764ad32 100644 --- a/sound/soc/codecs/rt1011.c +++ b/sound/soc/codecs/rt1011.c @@ -1627,14 +1627,18 @@ static int rt1011_hw_params(struct snd_pcm_substream *substream, static int rt1011_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt) { struct snd_soc_component *component = dai->component; + struct snd_soc_dapm_context *dapm = + snd_soc_component_get_dapm(component); unsigned int reg_val = 0, reg_bclk_inv = 0; + int ret = 0; + snd_soc_dapm_mutex_lock(dapm); switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { case SND_SOC_DAIFMT_CBS_CFS: reg_val |= RT1011_I2S_TDM_MS_S; break; default: - return -EINVAL; + ret = -EINVAL; } switch (fmt & SND_SOC_DAIFMT_INV_MASK) { @@ -1644,7 +1648,7 @@ static int rt1011_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt) reg_bclk_inv |= RT1011_TDM_INV_BCLK; break; default: - return -EINVAL; + ret = -EINVAL; } switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) { @@ -1660,7 +1664,7 @@ static int rt1011_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt) reg_val |= RT1011_I2S_TDM_DF_PCM_B; break; default: - return -EINVAL; + ret = -EINVAL; } switch (dai->id) { @@ -1675,9 +1679,11 @@ static int rt1011_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt) break; default: dev_err(component->dev, "Invalid dai->id: %d\n", dai->id); - return -EINVAL; + ret = -EINVAL; } - return 0; + + snd_soc_dapm_mutex_unlock(dapm); + return ret; } static int rt1011_set_component_sysclk(struct snd_soc_component *component, @@ -1796,8 +1802,12 @@ static int rt1011_set_tdm_slot(struct snd_soc_dai *dai, unsigned int tx_mask, unsigned int rx_mask, int slots, int slot_width) { struct snd_soc_component *component = dai->component; + struct snd_soc_dapm_context *dapm = + snd_soc_component_get_dapm(component); unsigned int val = 0, tdm_en = 0; + int ret = 0; + snd_soc_dapm_mutex_lock(dapm); if (rx_mask || tx_mask) tdm_en = RT1011_TDM_I2S_DOCK_EN_1; @@ -1817,7 +1827,7 @@ static int rt1011_set_tdm_slot(struct snd_soc_dai *dai, case 2: break; default: - return -EINVAL; + ret = -EINVAL; } switch (slot_width) { @@ -1836,7 +1846,7 @@ static int rt1011_set_tdm_slot(struct snd_soc_dai *dai, case 16: break; default: - return -EINVAL; + ret = -EINVAL; } snd_soc_component_update_bits(component, RT1011_TDM1_SET_1, @@ -1853,7 +1863,8 @@ static int rt1011_set_tdm_slot(struct snd_soc_dai *dai, RT1011_ADCDAT1_PIN_CONFIG | RT1011_ADCDAT2_PIN_CONFIG, RT1011_ADCDAT1_OUTPUT | RT1011_ADCDAT2_OUTPUT); - return 0; + snd_soc_dapm_mutex_unlock(dapm); + return ret; } static int rt1011_probe(struct snd_soc_component *component) -- 2.23.0

2 1

[alsa-devel] [PATCH v2 1/3] ASoC: mediatek: mt8183: fix tdm out data align issue
by Jiaxin Yu 27 Aug '19

27 Aug '19

Mt8183 tdm out support S16_LE/S24_LE/S32_LE formats. When output S32_LE, we need set hd_align so that memif can output MSB 24bits. When output S24_LE, we need reset hd_align so that memif can output LSB 24bits. Signed-off-by: Jiaxin Yu <jiaxin.yu(a)mediatek.com> --- sound/soc/mediatek/common/mtk-afe-fe-dai.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sound/soc/mediatek/common/mtk-afe-fe-dai.c b/sound/soc/mediatek/common/mtk-afe-fe-dai.c index d16563408465..10ea4fdbeb1e 100644 --- a/sound/soc/mediatek/common/mtk-afe-fe-dai.c +++ b/sound/soc/mediatek/common/mtk-afe-fe-dai.c @@ -241,7 +241,7 @@ int mtk_afe_fe_prepare(struct snd_pcm_substream *substream, struct mtk_base_afe *afe = snd_soc_dai_get_drvdata(dai); struct mtk_base_afe_memif *memif = &afe->memif[rtd->cpu_dai->id]; int hd_audio = 0; - int hd_align = 1; + int hd_align = 0; /* set hd mode */ switch (substream->runtime->format) { @@ -254,7 +254,6 @@ int mtk_afe_fe_prepare(struct snd_pcm_substream *substream, break; case SNDRV_PCM_FORMAT_S24_LE: hd_audio = 1; - hd_align = 0; break; default: dev_err(afe->dev, "%s() error: unsupported format %d\n", -- 2.18.0

2 1

[alsa-devel] [PATCH 00/35] ASoC: Intel: Clenaup SST initialization
by Cezary Rojewski 27 Aug '19

27 Aug '19

This segment targets initialization procedures for all SST drivers. For legacy: - it concentrates on updating ACPI loader so generic DSP framework is not fed any platform specific data. sst-acpi module ceases to exist and is replaced by hsw-acpi and byt-acpi For cAVS (Skylake+): - Repairs what is currently an initialization mess, given the order of invocation of engaged handlers and sheer amount of them. - provides interface to offload hardware-specifics away from driver Following is the order of Skylake initialization currently: - skl_probe -> schedule skl_probe_work - skl_first_init - skl_create -> skl_init_dsp --> skl/ bxt/ cnl_sst_dsp_init ---> skl_sst_ctx_init ----> skl_dsp_ctx_init -----> sst_dsp_new ------> sst_ops::init (invoked but unimplemented!) Listing all the types engaged together with the naming chosen for the above paints an even darker picture. Code is unreadable and hides initialization for diffenret members is various handlers. Moreover, due to existing ill relationship between skl_dev, sst_dsp and sst_generic_ipc, one must be extra careful when accessing so called "dsp/ thread_context" as they all don't get initialized immediately before object is yield for further processing. However, 100/100 series is nonsense and thus cleanups have been divided into chunks and prioritized. Code seen here is part of new Skylake fundament, located at the very bottom of internal mainline. Said mainline is tested constantly on at least sigle platform from every cAVS bucket (description below). This week, BDW has been added to the CI family and was essential in validating legacy changes. Baytrail platform is still missing. Changes for BYT directly mirror HSW/ BDW but due to current lack of platform were untested. Boards engaged in testing: rt286, rt298, rt274. !!! IMPORTANT !!! Some upstream FW binaries are not compatible with existing /skylake driver while changes found here (HARDWARE_CONFIG/ FIRMWARE_CONFIG) make use of firmware ability to offload hardware-specifics away from driver. These and more are core part of any cAVS design and are to be implemented and used by host. This too is missing on Linux upstream. As explanined once, five main FW branches are available: - kbl, 1.5 cAVS (supports SKL, KBL, KBL-R, ABL, more..) - apl_auto, 1.5+ cAVS (supports APL, GLK) - cnl, 1.8 cAVS (supports CNL, CFL, WHL, CML) - icl, 2.0 cAVS (supports ICL, LKF) - master, 2.5 cAVS (supports TGL, EHL and everything above) SKL FW binary existing on upstream is a descendant of old spt branch, obsoleted for 4-5 years now. That FW is a stub, quickly replaced by kbl which is to be used on all 1.5 cAVS platforms. The same story goes with bxtn binary, a descendant of apl branch, replaced by apl_auto 2-3 years ago. All vendors, entire validation and development is located on apl_auto. Message: all FW binaries are to be updated as we cannot guarantee these are still functional. Given the fact that all vendors are fed with new binaries on regular basis from all main branches, it's highly probable some scenarios fail with existing FWs. In consequence, linux-firmware patch will be provided with fresh, updated binaries, soon. Once more, please note, we do not support, nor test platforms using obsolete FW binaries. That includes all platforms, not just SKL or APL. Amadeusz Sławiński (1): ASoC: Intel: Skylake: Put FW runtime params defs in one place Cezary Rojewski (34): ASoC: Intel: Skylake: Add FIRMWARE_CONFIG IPC request ASoC: Intel: Skylake: Add HARDWARE_CONFIG IPC request ASoC: Intel: Skylake: Unify firmware loading mechanism ASoC: Intel: Skylake: Reload libraries on D0 entry for CNL ASoC: Intel: Skylake: Unhardcode dsp cores number ASoC: Intel: Skylake: Update interrupt disabling routine ASoC: Intel: Skylake: Inline ipc free operations ASoC: Intel: Skylake: Unify driver cleanup mechanism ASoC: Intel: Relocate irq thread header to sst_ops ASoC: Intel: Merge sst_dsp_device into sst_pdata ASoC: Intel: Skylake: Reuse sst_dsp_free ASoC: Intel: Skylake: Reuse sst_dsp_new ASoC: Intel: Skylake: Remove skl_dsp_acquire_irq ASoC: Intel: Skylake: Use dsp loading functions directly ASoC: Intel: Skylake: Make dsp_ops::stream_tag obsolete ASoC: Intel: Skylake: Remove skl_dsp_loader_ops ASoC: Intel: Skylake: Remove window0 sst_addr fields ASoC: Intel: Skylake: Remove redundant W0 and W1 macros ASoC: Intel: Skylake: Remove redundant SRAM fields ASoC: Intel: Expose ACPI loading members ASoC: Intel: Haswell: Define separate ACPI loader ASoC: Intel: Baytrail: Define separate ACPI loader ASoC: Intel: Refactor probing of ACPI devices ASoC: Intel: Skylake: Simplify skl_sst_ctx_init declaration ASoC: Intel: Skylake: Simplify all sst_dsp_init declarations ASoC: Intel: Skylake: Define platform descriptors ASoC: Intel: Skylake: Update skl_ids table ASoC: Intel: Skylake: Flip SST initialization order ASoC: Intel: Reuse sst_pdata::fw_name field ASoC: Intel: Reuse sst_pdata::fw field ASoC: Intel: Skylake: Remove skl_dsp_ops ASoC: Intel: Skylake: Privatize SST init handlers ASoC: Intel: Skylake: Merge skl_sst_ctx_init into skl_init_dsp ASoC: Intel: Remove obsolete firmware fields sound/soc/intel/Kconfig | 14 +- sound/soc/intel/baytrail/Makefile | 2 + sound/soc/intel/baytrail/acpi.c | 64 +++++ sound/soc/intel/baytrail/sst-baytrail-dsp.c | 2 +- sound/soc/intel/baytrail/sst-baytrail-ipc.c | 13 +- sound/soc/intel/baytrail/sst-baytrail-ipc.h | 2 + sound/soc/intel/common/Makefile | 4 +- .../intel/common/soc-acpi-intel-bxt-match.c | 2 - .../intel/common/soc-acpi-intel-byt-match.c | 2 - .../intel/common/soc-acpi-intel-cnl-match.c | 1 - .../intel/common/soc-acpi-intel-glk-match.c | 3 - .../intel/common/soc-acpi-intel-hda-match.c | 2 - .../common/soc-acpi-intel-hsw-bdw-match.c | 4 - .../intel/common/soc-acpi-intel-icl-match.c | 1 - .../intel/common/soc-acpi-intel-kbl-match.c | 12 - .../intel/common/soc-acpi-intel-skl-match.c | 3 - sound/soc/intel/common/sst-acpi.c | 117 +-------- sound/soc/intel/common/sst-dsp-priv.h | 8 +- sound/soc/intel/common/sst-dsp.h | 37 +-- sound/soc/intel/common/sst-firmware.c | 13 +- sound/soc/intel/haswell/Makefile | 2 + sound/soc/intel/haswell/acpi.c | 78 ++++++ sound/soc/intel/haswell/sst-haswell-dsp.c | 1 + sound/soc/intel/haswell/sst-haswell-ipc.c | 13 +- sound/soc/intel/haswell/sst-haswell-ipc.h | 2 + sound/soc/intel/skylake/bxt-sst.c | 143 ++++------- sound/soc/intel/skylake/cnl-sst-dsp.c | 13 +- sound/soc/intel/skylake/cnl-sst-dsp.h | 15 +- sound/soc/intel/skylake/cnl-sst.c | 142 ++++------- sound/soc/intel/skylake/skl-debug.c | 2 +- sound/soc/intel/skylake/skl-messages.c | 194 ++------------ sound/soc/intel/skylake/skl-pcm.c | 22 +- sound/soc/intel/skylake/skl-sst-cldma.c | 10 +- sound/soc/intel/skylake/skl-sst-dsp.c | 79 ++---- sound/soc/intel/skylake/skl-sst-dsp.h | 55 ++-- sound/soc/intel/skylake/skl-sst-ipc.c | 238 ++++++++++++++++-- sound/soc/intel/skylake/skl-sst-ipc.h | 124 ++++++++- sound/soc/intel/skylake/skl-sst-utils.c | 28 +-- sound/soc/intel/skylake/skl-sst.c | 150 ++++++----- sound/soc/intel/skylake/skl.c | 65 +++-- sound/soc/intel/skylake/skl.h | 26 +- 41 files changed, 877 insertions(+), 831 deletions(-) create mode 100644 sound/soc/intel/baytrail/acpi.c create mode 100644 sound/soc/intel/haswell/acpi.c -- 2.17.1

4 106

[alsa-devel] [PATCH 0/6] Small fixes
by Amadeusz Sławiński 27 Aug '19

27 Aug '19

Series of small fixes: * fixes few issues found during checking code with static checkers * fix few prints * define function in header, like it should be * release topology when done with it Amadeusz Sławiński (6): ASoC: Intel: Skylake: Use correct function to access iomem space ASoC: Intel: Fix use of potentially uninitialized variable ASoC: dapm: Expose snd_soc_dapm_new_control_unlocked properly ASoC: Intel: Skylake: Print module type instead of id ASoC: Intel: Skylake: Release topology when we are done with it ASoC: Intel: NHLT: Fix debug print format include/sound/soc-dapm.h | 3 +++ sound/soc/intel/common/sst-ipc.c | 2 ++ sound/soc/intel/skylake/skl-debug.c | 2 +- sound/soc/intel/skylake/skl-messages.c | 5 +++-- sound/soc/intel/skylake/skl-nhlt.c | 2 +- sound/soc/intel/skylake/skl-topology.c | 20 ++++++++++---------- sound/soc/intel/skylake/skl.h | 1 - sound/soc/soc-topology.c | 6 ------ 8 files changed, 20 insertions(+), 21 deletions(-) -- 2.17.1

3 8

[alsa-devel] [PATCH] ALSA: hda - Allow runtime PM for controller if component notifier is used
by Takashi Iwai 27 Aug '19

27 Aug '19

Currently we disallow the runtime PM of the HD-audio controller if it's bound with HDMI/DP on Nvidia / AMD unless it's for dGPU. This is for keeping the link up to get the proper notification for ELD hotplug. As explained in the commit 37a3a98ef601 ("ALSA: hda - Enable runtime PM only for discrete GPU"), this keep-power-up behavior is rather a stop-gap solution until the ELD notification via audio component. And now we finally got the audio component for these graphics drivers via commit ade49db337a9 ("ALSA: hda/hdmi - Allow audio component for AMD/ATI and Nvidia HDMI"), so it's time to change. This patch makes HD-audio controller again runtime-suspendable when the device gets bound with audio component in HDMI codec driver. For making it easier to access from the codec driver, move the flag into the common hda_bus object instead of hda_intel flag. Also rename it to keep_power, to indicate the actual meaning. Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- include/sound/hda_codec.h | 1 + sound/pci/hda/hda_intel.c | 11 +++++------ sound/pci/hda/hda_intel.h | 1 - sound/pci/hda/patch_hdmi.c | 4 +++- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/include/sound/hda_codec.h b/include/sound/hda_codec.h index 871993696c5f..9a0393cf024c 100644 --- a/include/sound/hda_codec.h +++ b/include/sound/hda_codec.h @@ -59,6 +59,7 @@ struct hda_bus { unsigned int in_reset:1; /* during reset operation */ unsigned int no_response_fallback:1; /* don't fallback at RIRB error */ unsigned int bus_probing :1; /* during probing process */ + unsigned int keep_power:1; /* keep power up for notification */ int primary_dig_out_type; /* primary digital out PCM type */ unsigned int mixer_assigned; /* codec addr for mixer name */ diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 4496fce21300..91e71be42fa4 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -356,7 +356,7 @@ enum { */ #ifdef SUPPORT_VGA_SWITCHEROO #define use_vga_switcheroo(chip) ((chip)->use_vga_switcheroo) -#define needs_eld_notify_link(chip) ((chip)->need_eld_notify_link) +#define needs_eld_notify_link(chip) ((chip)->bus.keep_power) #else #define use_vga_switcheroo(chip) 0 #define needs_eld_notify_link(chip) false @@ -1145,7 +1145,7 @@ static int azx_runtime_idle(struct device *dev) return -EBUSY; /* ELD notification gets broken when HD-audio bus is off */ - if (needs_eld_notify_link(hda)) + if (needs_eld_notify_link(chip)) return -EBUSY; return 0; @@ -1256,7 +1256,7 @@ static void setup_vga_switcheroo_runtime_pm(struct azx *chip) struct hda_intel *hda = container_of(chip, struct hda_intel, chip); struct hda_codec *codec; - if (hda->use_vga_switcheroo && !hda->need_eld_notify_link) { + if (hda->use_vga_switcheroo && !needs_eld_notify_link(chip)) { list_for_each_codec(codec, &chip->bus) codec->auto_runtime_pm = 1; /* reset the power save setup */ @@ -1270,10 +1270,9 @@ static void azx_vs_gpu_bound(struct pci_dev *pci, { struct snd_card *card = pci_get_drvdata(pci); struct azx *chip = card->private_data; - struct hda_intel *hda = container_of(chip, struct hda_intel, chip); if (client_id == VGA_SWITCHEROO_DIS) - hda->need_eld_notify_link = 0; + chip->bus.keep_power = 0; setup_vga_switcheroo_runtime_pm(chip); } @@ -1285,7 +1284,7 @@ static void init_vga_switcheroo(struct azx *chip) dev_info(chip->card->dev, "Handle vga_switcheroo audio client\n"); hda->use_vga_switcheroo = 1; - hda->need_eld_notify_link = 1; /* cleared in gpu_bound op */ + chip->bus.keep_power = 1; /* cleared in either gpu_bound op or codec probe */ chip->driver_caps |= AZX_DCAPS_PM_RUNTIME; pci_dev_put(p); } diff --git a/sound/pci/hda/hda_intel.h b/sound/pci/hda/hda_intel.h index 1468865e0342..2acfff3da1a0 100644 --- a/sound/pci/hda/hda_intel.h +++ b/sound/pci/hda/hda_intel.h @@ -25,7 +25,6 @@ struct hda_intel { /* vga_switcheroo setup */ unsigned int use_vga_switcheroo:1; - unsigned int need_eld_notify_link:1; unsigned int vga_switcheroo_registered:1; unsigned int init_failed:1; /* delayed init failed */ diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index 933c7bf47ef6..83b8b9d27711 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -2542,8 +2542,10 @@ static void generic_acomp_init(struct hda_codec *codec, spec->port2pin = port2pin; setup_drm_audio_ops(codec, ops); if (!snd_hdac_acomp_init(&codec->bus->core, &spec->drm_audio_ops, - match_bound_vga, 0)) + match_bound_vga, 0)) { spec->acomp_registered = true; + codec->bus->keep_power = 0; + } } /* -- 2.16.4

1 0

[alsa-devel] pulse audio problem
by John Menninger 27 Aug '19

27 Aug '19

In going over my Ubuntu 16.04 (64bit) system log I found the following: "Aug 27 00:02:22 Desktop64 pulseaudio[2726]: [alsa-sink-ALC889A Analog] alsa-util.c: snd_pcm_avail() returned a value that is exceptionally large: 2284120 bytes (12948 ms). "Aug 27 00:02:29 Desktop64 pulseaudio[2726]: [alsa-sink-ALC889A Analog] alsa-util.c: Most likely this is a bug in the ALSA driver 'snd_hda_intel'. Please report this issue to the ALSA developers." I have no idea how to manage any problem that might have caused this notification and I would appreciate any advice you may have. -- thanks, John Menninger -- John Menninger 735 George St. Iowa City, Iowa 52246

1 0