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

[alsa-devel] [PATCH v3 00/13] ASoC: Add support to WCD9335 Audio Codec
by Srinivas Kandagatla 17 Sep '18

17 Sep '18

Thankyou for reviewing v2 patchset, here is v3 addressing comments from v2. Qualcomm WCD9335 Codec is a standalone Hi-Fi audio codec IC. It is integrated in multiple Qualcomm SoCs like: MSM8996, MSM8976, and MSM8956 chipsets. WCD9335 had multiple functional blocks, like: Soundwire controller, interrupt mux, pin controller, Audio codec, MBHC, MAD(Mic activity Detection), Ultrasonic proximity and pen detection, Battery-voltage monitoring and Codec processing engine. Currently this patchset has been only tested with SLIMbus interface due to hardware avaiablity, but it can be easily made to work with both SLIMbus and I2C/I2S. This patchset adds very basic playback and capture support witout much fancy features. New features will be added once the basic support is in. This patchset is tested on top of linux-next on DB820c for both playback , capture paths and MBHC. Some parts of the code has been inherited from Qualcomm andriod kernel, so credits to various authors. WCD9335 can be interfaced via I2S/I2C or SLIMbus. Here is my test branch incase someone want to try this out: https://git.linaro.org/people/srinivas.kandagatla/linux.git/log/?h=wcd9335 Thanks, Srini Changes since v2 (https://lwn.net/Articles/761107/) - Updated dt bindings according to Robs Comments. - Added MBHC support with new bindings - Moved mfd irq in to single file as suggested by Lee Jones. - Addressed various minor comments on mfd driver by Lee Jones. - Rebased on top of 4.19-rc1 - renamed clsh as clsh-v2 as its v2 block Srinivas Kandagatla (13): ASoC: dt-bindings: update wcd9335 bindings. mfd: wcd9335: add support to wcd9335 core mfd: wcd9335: add wcd irq support ASoC: wcd9335: add support to wcd9335 codec ASoC: wcd9335: add CLASS-H Controller support ASoC: wcd9335: add basic controls ASoC: wcd9335: add playback dapm widgets ASoC: wcd9335: add capture dapm widgets ASoC: wcd9335: add audio routings ASoC: dt-bindings: Add WCD9335 MBHC specific properties ASoC: wcd9335: add mbhc support ASoC: apq8096: add slim support ASoC: apq8096: add headset JACK support .../bindings/sound/qcom,wcd9335.txt | 30 +- drivers/mfd/Kconfig | 14 + drivers/mfd/Makefile | 4 + drivers/mfd/wcd9335-core.c | 369 ++ include/linux/mfd/wcd9335/registers.h | 627 ++ include/linux/mfd/wcd9335/wcd9335.h | 65 + sound/soc/codecs/Kconfig | 5 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/wcd-clsh-v2.c | 577 ++ sound/soc/codecs/wcd-clsh-v2.h | 49 + sound/soc/codecs/wcd9335.c | 5234 +++++++++++++++++ sound/soc/qcom/apq8096.c | 122 +- 12 files changed, 7092 insertions(+), 6 deletions(-) create mode 100644 drivers/mfd/wcd9335-core.c create mode 100644 include/linux/mfd/wcd9335/registers.h create mode 100644 include/linux/mfd/wcd9335/wcd9335.h create mode 100644 sound/soc/codecs/wcd-clsh-v2.c create mode 100644 sound/soc/codecs/wcd-clsh-v2.h create mode 100644 sound/soc/codecs/wcd9335.c -- 2.18.0

4 27

[alsa-devel] [PATCH 0/7] slimbus: fix module loading
by srinivas.kandagatla＠linaro.org 17 Sep '18

17 Sep '18

From: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> Hi Greg, Here are some of the fixes for issues found while testing module loading on DB820c debian setup. First 3 core fixes are to do with generating uevents, calling status callback in probe sequence if the device is up and one fix is able to match device id from device tree compatible strings. Second 4 ngd patches fixes few issues firstly with registration, secondly checking the validity of logical address assigned by remote. Lastly there are few typo fixes. Thanks, Srini Srinivas Kandagatla (7): slimbus: core: add support to uevent slimbus: core: update device status in probe slimbus: core: match device tree based devices correctly slimbus: ngd: validate logical address assigned by remote silmbus: ngd: register controller after power up. slimbus: ngd: return proper error code instead of zero slimbus: ngd: register ngd driver only once. drivers/slimbus/core.c | 37 +++++++++++++++++++++++++++++++++++-- drivers/slimbus/qcom-ngd-ctrl.c | 28 +++++++++++++++++----------- 2 files changed, 52 insertions(+), 13 deletions(-) -- 2.9.3

1 7

[alsa-devel] [PATCH 0/3] ASoC: qdsp6: add compress offload support
by Srinivas Kandagatla 17 Sep '18

17 Sep '18

This patchset adds support to very basic MP3 playback compress offload support via QDSP ASM module. Tested this patchset on DB410c with APQ8016 and DB820c with APQ8096 using tinycompress library. Adding other codec support should be trivial w.r.t qdsp6 side, however there are other dependencies like compress UAPI header changes and FastRPC which are being worked in parallel. Once ready will post them! thanks, srini Srinivas Kandagatla (3): ASoC: q6asm-dai: dt-bindings: Add support to compress dais ASoC: qdsp6: q6asm: add support to MP3 format ASoC: qdsp6: q6asm-dai: Add support to compress offload .../devicetree/bindings/sound/qcom,q6asm.txt | 27 ++ sound/soc/qcom/Kconfig | 1 + sound/soc/qcom/qdsp6/q6asm-dai.c | 418 +++++++++++++++++- sound/soc/qcom/qdsp6/q6asm.c | 5 + 4 files changed, 450 insertions(+), 1 deletion(-) -- 2.18.0

3 7

[alsa-devel] [RFC v2 - AAF PCM plugin 0/5] Introduce AVTP Audio Format (AAF) plugin
by Andre Guedes 15 Sep '18

15 Sep '18

Hi all, This is the version 2 of AAF plugin RFC series. For general context information about the AAF plugin, please refer to the cover letter from version 1 [1] and the documentation in doc/aaf.txt. Code-wise, the main changes in this new version are: 1) The media clock was generating timestamps in UTC coordinate. However, AVTP timestamps are in TAI coordinate system so the media clock was fixed to use TAI instead. 2) All plugin resources (e.g. buffers, fds) are now allocated/freed in hw_params/hw_free ioplug callbacks. 3) The plugin constraints are applied at entry point instead of hw_params callback. Also, in this new version, the commit message from patch "aaf: Implement Playback mode support" was improved so it discusses the AVTP protocol restrictions in terms of formats and rates as well as why the plugin uses the system clock to implement a media clock. For further information about what has been discussed in the previous version, please refer to the RFC v1 patch series which starts in [1]. All versions of this series can be also found in my alsa-plugins tree in github [2]. Best regards, Andre [1] http://mailman.alsa-project.org/pipermail/alsa-devel/2018-August/139494.Even [2] https://github.com/aguedes/alsa-plugins Andre Guedes (5): aaf: Introduce plugin skeleton aaf: Load configuration parameters aaf: Implement Playback mode support aaf: Prepare for Capture mode support aaf: Implement Capture mode support Makefile.am | 3 + aaf/Makefile.am | 9 + aaf/pcm_aaf.c | 1214 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 9 + doc/aaf.txt | 142 +++++++ 5 files changed, 1377 insertions(+) create mode 100644 aaf/Makefile.am create mode 100644 aaf/pcm_aaf.c create mode 100644 doc/aaf.txt -- 2.14.4

1 5

[alsa-devel] Wrong UCM profile for Dell TB16 / WD15
by KillerRex 14 Sep '18

14 Sep '18

Hello, I have a Dell TB16 (same sound hardware as the WD15) and since the update to kernel 4.18 pulseaudio does not recognise any more the audio ports in the dock. After some work tracking the problem I have found that pulseaudio reports a failure when using the UCM profile from Dell-WD15-Dock: ... ( 0.027| 0.000) I: [pulseaudio] module-alsa-card.c: Found UCM profiles ( 0.027| 0.000) D: [pulseaudio] alsa-ucm.c: UCM mapping: Mapping HiFi: hw:WD15Dock,0: source dev Mic ( 0.027| 0.000) D: [pulseaudio] alsa-ucm.c: UCM mapping: Mapping HiFi: hw:WD15Dock,1: sink dev LineOut ( 0.027| 0.000) D: [pulseaudio] alsa-ucm.c: UCM mapping: Mapping HiFi: hw:WD15Dock,0: sink dev Headphone ( 0.027| 0.000) D: [pulseaudio] alsa-mixer.c: Profile HiFi (Default), input=(null), output=(null) priority=8000, supported=yes n_input_mappings=1, n_output_mappings=2 ( 0.027| 0.000) D: [pulseaudio] alsa-mixer.c: Input HiFi: hw:WD15Dock,0: source ( 0.027| 0.000) D: [pulseaudio] alsa-mixer.c: Output HiFi: hw:WD15Dock,1: sink ( 0.027| 0.000) D: [pulseaudio] alsa-mixer.c: Output HiFi: hw:WD15Dock,0: sink ( 0.027| 0.000) I: [pulseaudio] alsa-ucm.c: Set ucm verb to HiFi ( 0.027| 0.000) D: [pulseaudio] alsa-util.c: Trying hw:WD15Dock,1 with SND_PCM_NO_AUTO_FORMAT ... ( 0.028| 0.000) I: [pulseaudio] (alsa-lib)pcm_hw.c: Invalid value for card ( 0.028| 0.000) I: [pulseaudio] alsa-util.c: Error opening PCM device hw:WD15Dock,1: No such device ... The problem is that the device is called "Dock" and not "WD15Dock" so changing the file "alsa/ucm/Dell-WD15-Dock/HiFi.conf" with the right device name corrects the problem: --- alsa/ucm/Dell-WD15-Dock/HiFi.conf_ori 2018-09-14 17:54:35.022035850 +0200 +++ alsa/ucm/Dell-WD15-Dock/HiFi.conf 2018-09-14 17:54:55.722248500 +0200 @@ -3,7 +3,7 @@ Value { PlaybackChannels "2" - PlaybackPCM "hw:WD15Dock,0" + PlaybackPCM "hw:Dock,0" } } @@ -12,7 +12,7 @@ Value { PlaybackChannels "2" - PlaybackPCM "hw:WD15Dock,1" + PlaybackPCM "hw:Dock,1" } } @@ -21,6 +21,6 @@ Value { CaptureChannels "2" - CapturePCM "hw:WD15Dock,0" + CapturePCM "hw:Dock,0" } } Is this the right change or the real problem is that the device name is "Dock" instead "WD15Dock"? Removing the "WD15" from the name is better, in that way it is also valid for the TB16. Thanks Andres Ayala

1 0

[alsa-devel] [PATCH] ALSA: atiixp: fix fall-through annotations
by Gustavo A. R. Silva 14 Sep '18

14 Sep '18

Replace "fallthru" with a proper "fall through" annotation. This fix is part of the ongoing efforts to enabling -Wimplicit-fallthrough Signed-off-by: Gustavo A. R. Silva <gustavo(a)embeddedor.com> --- sound/pci/atiixp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/pci/atiixp.c b/sound/pci/atiixp.c index a1e4944..1a41f8c 100644 --- a/sound/pci/atiixp.c +++ b/sound/pci/atiixp.c @@ -903,15 +903,15 @@ static int snd_atiixp_playback_prepare(struct snd_pcm_substream *substream) case 8: data |= ATI_REG_OUT_DMA_SLOT_BIT(10) | ATI_REG_OUT_DMA_SLOT_BIT(11); - /* fallthru */ + /* fall through */ case 6: data |= ATI_REG_OUT_DMA_SLOT_BIT(7) | ATI_REG_OUT_DMA_SLOT_BIT(8); - /* fallthru */ + /* fall through */ case 4: data |= ATI_REG_OUT_DMA_SLOT_BIT(6) | ATI_REG_OUT_DMA_SLOT_BIT(9); - /* fallthru */ + /* fall through */ default: data |= ATI_REG_OUT_DMA_SLOT_BIT(3) | ATI_REG_OUT_DMA_SLOT_BIT(4); -- 2.7.4

2 1

Re: [alsa-devel] [PATCH -next] ASoC: qdsp6: q6asm-dai: remove duplicated include from q6asm-dai.c
by Srinivas Kandagatla 14 Sep '18

14 Sep '18

On 14/09/18 02:36, YueHaibing wrote: > Remove duplicated include. > > Signed-off-by: YueHaibing <yuehaibing(a)huawei.com> Acked-by: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> > --- > sound/soc/qcom/qdsp6/q6asm-dai.c | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/sound/soc/qcom/qdsp6/q6asm-dai.c b/sound/soc/qcom/qdsp6/q6asm-dai.c > index c75fab3..c3806d7 100644 > --- a/sound/soc/qcom/qdsp6/q6asm-dai.c > +++ b/sound/soc/qcom/qdsp6/q6asm-dai.c > @@ -8,7 +8,6 @@ > #include <linux/platform_device.h> > #include <linux/slab.h> > #include <sound/soc.h> > -#include <sound/soc.h> > #include <sound/soc-dapm.h> > #include <sound/pcm.h> > #include <asm/dma.h> > > >

1 0

Re: [alsa-devel] of_dma_request_slave_channel() failed ?
by Geert Uytterhoeven 14 Sep '18

14 Sep '18

Hi Morimoto-san, CC asoc, dma, iommu On Tue, Sep 4, 2018 at 8:06 AM Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> wrote: > Hi Renesas ML > Cc Rob > > I noticed that Sound driver is using PIO mode > on latest kernel. > > ... > rcar_sound ec500000.sound: src[0] : probe error -11 > rcar_sound ec500000.sound: ssi[0] fallback to PIO mode > rcar_sound ec500000.sound: src[1] : probe error -11 > rcar_sound ec500000.sound: ssi[1] fallback to PIO mode > rcar_sound ec500000.sound: ssi[2] : probe error -11 > rcar_sound ec500000.sound: ssi[2] fallback to PIO mode > rcar_sound ec500000.sound: ssi[3] : probe error -11 > rcar_sound ec500000.sound: ssi[3] fallback to PIO mode > rcar_sound ec500000.sound: probed > ... > > Sound can use DMA mode and PIO mode. > It automatically fallbacks to PIO mode if it can't use DMA. > > I bisected this issue, and found the 1st bad commit > > ----------------------------------------------------- > commit ac6bbf0cdf4206c517ac9789814c23e372ebce4d > Author: Rob Herring <robh(a)kernel.org> > Date: Mon Jul 9 09:41:52 2018 -0600 > > iommu: Remove IOMMU_OF_DECLARE > > Now that we use the driver core to stop deferred probe for missing > drivers, IOMMU_OF_DECLARE can be removed. > > This is slightly less optimal than having a list of built-in drivers in > that we'll now defer probe twice before giving up. This shouldn't have a > significant impact on boot times as past discussions about deferred > probe have given no evidence of deferred probe having a substantial > impact. > ... > ----------------------------------------------------- > > In more detail, it seems it can't find DMA controller, > and of_dma_request_slave_channel() returns > -EPROBE_DEFER from this commit. > > struct dma_chan *of_dma_request_slave_channel(struct device_node *np, > const char *name) > { > ... > ofdma = of_dma_find_controller(&dma_spec); > > if (ofdma) { > chan = ofdma->of_dma_xlate(&dma_spec, ofdma); > } else { > => ret_no_channel = -EPROBE_DEFER; > chan = NULL; > } > ... > => return ERR_PTR(ret_no_channel); > } > > Is this known issue ? > Or sound shouldn't fallbacks to PIO mode ? I assume you wrote commit 6c92d5a2744e2761 ("ASoC: rsnd: don't fallback to PIO mode when -EPROBE_DEFER") to work around this? While this got rid of the error messages, and postpones sound initialization until the audio DMAC is available, it does mean that the driver will _never_ fall back to PIO. I.e. if CONFIG_RCAR_DMAC=n, audio will fail to probe instead of falling back to PIO. With CONFIG_RCAR_DMAC=y: rcar-dmac e6700000.dma-controller: ignoring dependency for device, assuming no driver rcar-dmac e7300000.dma-controller: ignoring dependency for device, assuming no driver rcar-dmac e7310000.dma-controller: ignoring dependency for device, assuming no driver rcar-dmac ec700000.dma-controller: ignoring dependency for device, assuming no driver rcar-dmac ec720000.dma-controller: ignoring dependency for device, assuming no driver So it seems the audio DMAC is deferred a second time, before the iommu driver probed. subsys_initcall(ipmmu_init); calls platform_driver_register module_platform_driver(rcar_dmac_driver); Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert(a)linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds

4 9

Re: [alsa-devel] i915, HDMI/DP audio with multiple monitors
by Ville Syrjälä 13 Sep '18

13 Sep '18

On Tue, Sep 11, 2018 at 03:50:13PM +0200, Bruno Prémont wrote: > Hi, > > I have a system with multiple monitors and would like to send > notification sounds to the monitor on which corresponding > window is visible. > > For a workstation and a tiny computer things look different: > - workstation (Intel(R) Core(TM) i7-4770 CPU @ 3.40GHz): > 00:02.0 VGA compatible controller [0300]: Intel Corporation Xeon E3-1200 v3/4th Gen Core Processor Integrated Graphics Controller [8086:0412] (rev 06) > 00:03.0 Audio device [0403]: Intel Corporation Xeon E3-1200 v3/4th Gen Core Processor HD Audio Controller [8086:0c0c] (rev 06) > 00:1b.0 Audio device [0403]: Intel Corporation 8 Series/C220 Series Chipset High Definition Audio Controller [8086:8c20] (rev 04) > > Here alsa show me two cards: > - HDA Intel PCH (Realtek ALC671) > - HDA Intel HDMI (Intel Generic) > > **** List of PLAYBACK Hardware Devices **** > card 0: HDMI [HDA Intel HDMI], device 3: Generic Digital [Generic Digital] > Subdevices: 1/1 > Subdevice #0: subdevice #0 There should normally be multiple HDMI devices (one for each HDMI/DP connector more or less). Eg. my hsw shows: card 0: HDMI [HDA Intel HDMI], device 3: HDMI 0 [HDMI 0] Subdevices: 1/1 Subdevice #0: subdevice #0 card 0: HDMI [HDA Intel HDMI], device 7: HDMI 1 [HDMI 1] Subdevices: 1/1 Subdevice #0: subdevice #0 Looking at the hda_codec.c we see: static int audio_idx[HDA_PCM_NTYPES][5] = { ... [HDA_PCM_TYPE_HDMI] = { 3, 7, 8, 9, -1 }, So you always get those device numbers, but I don't see an immediate relationship between those and the pin numbers (which do have some kind of relationship with the HDMI/DP port). I guess if they always get registered in order of the pin numbers then those would translate to 3 == port B, 7 == port C, etc. And after that the problem is figuring out which port is related to which connector, for which we have nothing at the moment. I suppose the ideal solution might be to have a sysfs symlink (or something) to connect the two together. But then there's MST where I think the pcm device correlates with the crtc rather than the connector. Maybe. I can't remember anymore, and I'm not sure it even works (I've recently heard people saying it doesn't). > card 1: PCH [HDA Intel PCH], device 0: ALC671 Analog [ALC671 Analog] > Subdevices: 1/1 > Subdevice #0: subdevice #0 > > > - tiny computer (Intel(R) Core(TM) i5-6500T CPU @ 2.50GHz): > 00:02.0 VGA compatible controller [0300]: Intel Corporation HD Graphics 530 [8086:1912] (rev 06) > 00:1f.3 Audio device [0403]: Intel Corporation Sunrise Point-H HD Audio [8086:a170] (rev 31) > > Here alsa shows a single card: > - HDA Intel PCH (Realtek ALC671) > > **** List of PLAYBACK Hardware Devices **** > card 0: PCH [HDA Intel PCH], device 0: ALC671 Analog [ALC671 Analog] > Subdevices: 1/1 > Subdevice #0: subdevice #0 > card 0: PCH [HDA Intel PCH], device 3: Generic Digital [Generic Digital] > Subdevices: 1/1 > Subdevice #0: subdevice #0 > > > How can I determine/set to which monitor the sound should go, and preferably send > different sounds to both monitors at same time? > > > Cheers, > Bruno > _______________________________________________ > dri-devel mailing list > dri-devel(a)lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel -- Ville Syrjälä Intel

5 4

[alsa-devel] [PATCH v2] ALSA: hda - Enable runtime PM only for discrete GPU
by Takashi Iwai 13 Sep '18

13 Sep '18

The recent change of vga_switcheroo allowed the runtime PM for HD-audio on AMD GPUs, but this also resulted in a regression. When the HD-audio controller driver gets runtime-suspended, HD-audio link is turned off, and the hotplug notification is ignored. This leads to the inconsistent audio state (the connection isn't notified and ELD is ignored). The best fix would be to implement the proper ELD notification via the audio component, but it's still not ready. As a quick workaround, this patch adds the check of runtime_idle and allows the runtime suspend only when the vga_switcheroo is bound with discrete GPU. That is, a system with a single GPU and APU would be again without runtime PM to keep the HD-audio link for the hotplug notification and ELD read out. Also, the codec->auto_runtime_pm flag is set only for the discrete GPU at the time GPU gets bound via vga_switcheroo (i.e. only dGPU is forcibly runtime-PM enabled), so that APU can still get the ELD notification. For identifying which GPU is bound, a new vga_switcheroo client callback, gpu_bound, is implemented. The vga_switcheroo simply calls this when GPU is bound, and tells whether it's dGPU or APU. Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=200945 Fixes: 07f4f97d7b4b ("vga_switcheroo: Use device link for HDA controller") Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- drivers/gpu/vga/vga_switcheroo.c | 2 + include/linux/vga_switcheroo.h | 3 ++ sound/pci/hda/hda_intel.c | 86 +++++++++++++++++++++++--------- sound/pci/hda/hda_intel.h | 1 + 4 files changed, 69 insertions(+), 23 deletions(-) diff --git a/drivers/gpu/vga/vga_switcheroo.c b/drivers/gpu/vga/vga_switcheroo.c index a96bf46bc483..cf2a18571d48 100644 --- a/drivers/gpu/vga/vga_switcheroo.c +++ b/drivers/gpu/vga/vga_switcheroo.c @@ -215,6 +215,8 @@ static void vga_switcheroo_enable(void) return; client->id = ret | ID_BIT_AUDIO; + if (client->ops->gpu_bound) + client->ops->gpu_bound(client->pdev, ret); } vga_switcheroo_debugfs_init(&vgasr_priv); diff --git a/include/linux/vga_switcheroo.h b/include/linux/vga_switcheroo.h index a34539b7f750..7e6ac0114d55 100644 --- a/include/linux/vga_switcheroo.h +++ b/include/linux/vga_switcheroo.h @@ -133,15 +133,18 @@ struct vga_switcheroo_handler { * @can_switch: check if the device is in a position to switch now. * Mandatory. The client should return false if a user space process * has one of its device files open + * @gpu_bound: notify the client id to audio client when the GPU is bound. * * Client callbacks. A client can be either a GPU or an audio device on a GPU. * The @set_gpu_state and @can_switch methods are mandatory, @reprobe may be * set to NULL. For audio clients, the @reprobe member is bogus. + * OTOH, @gpu_bound is only for audio clients, and not used for GPU clients. */ struct vga_switcheroo_client_ops { void (*set_gpu_state)(struct pci_dev *dev, enum vga_switcheroo_state); void (*reprobe)(struct pci_dev *dev); bool (*can_switch)(struct pci_dev *dev); + void (*gpu_bound)(struct pci_dev *dev, enum vga_switcheroo_client_id); }; #if defined(CONFIG_VGA_SWITCHEROO) diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 1b2ce304152a..aa4c672dbaf7 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -365,8 +365,10 @@ 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) #else #define use_vga_switcheroo(chip) 0 +#define needs_eld_notify_link(chip) false #endif #define CONTROLLER_IN_GPU(pci) (((pci)->device == 0x0a0c) || \ @@ -453,6 +455,7 @@ static inline void mark_runtime_wc(struct azx *chip, struct azx_dev *azx_dev, #endif static int azx_acquire_irq(struct azx *chip, int do_disconnect); +static void set_default_power_save(struct azx *chip); /* * initialize the PCI registers @@ -1201,6 +1204,10 @@ static int azx_runtime_idle(struct device *dev) azx_bus(chip)->codec_powered || !chip->running) return -EBUSY; + /* ELD notification gets broken when HD-audio bus is off */ + if (needs_eld_notify_link(hda)) + return -EBUSY; + return 0; } @@ -1298,6 +1305,36 @@ static bool azx_vs_can_switch(struct pci_dev *pci) return true; } +/* + * The discrete GPU cannot power down unless the HDA controller runtime + * suspends, so activate runtime PM on codecs even if power_save == 0. + */ +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) { + list_for_each_codec(codec, &chip->bus) + codec->auto_runtime_pm = 1; + /* reset the power save setup */ + if (chip->running) + set_default_power_save(chip); + } +} + +static void azx_vs_gpu_bound(struct pci_dev *pci, + enum vga_switcheroo_client_id client_id) +{ + 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; + setup_vga_switcheroo_runtime_pm(chip); +} + static void init_vga_switcheroo(struct azx *chip) { struct hda_intel *hda = container_of(chip, struct hda_intel, chip); @@ -1306,6 +1343,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->driver_caps |= AZX_DCAPS_PM_RUNTIME; pci_dev_put(p); } @@ -1314,6 +1352,7 @@ static void init_vga_switcheroo(struct azx *chip) static const struct vga_switcheroo_client_ops azx_vs_ops = { .set_gpu_state = azx_vs_set_state, .can_switch = azx_vs_can_switch, + .gpu_bound = azx_vs_gpu_bound, }; static int register_vga_switcheroo(struct azx *chip) @@ -1339,6 +1378,7 @@ static int register_vga_switcheroo(struct azx *chip) #define init_vga_switcheroo(chip) /* NOP */ #define register_vga_switcheroo(chip) 0 #define check_hdmi_disabled(pci) false +#define setup_vga_switcheroo_runtime_pm(chip) /* NOP */ #endif /* SUPPORT_VGA_SWITCHER */ /* @@ -1352,6 +1392,7 @@ static int azx_free(struct azx *chip) if (azx_has_pm_runtime(chip) && chip->running) pm_runtime_get_noresume(&pci->dev); + chip->running = 0; azx_del_card_list(chip); @@ -2230,6 +2271,25 @@ static struct snd_pci_quirk power_save_blacklist[] = { }; #endif /* CONFIG_PM */ +static void set_default_power_save(struct azx *chip) +{ + int val = power_save; + +#ifdef CONFIG_PM + if (pm_blacklist) { + const struct snd_pci_quirk *q; + + q = snd_pci_quirk_lookup(chip->pci, power_save_blacklist); + if (q && val) { + dev_info(chip->card->dev, "device %04x:%04x is on the power_save blacklist, forcing power_save to 0\n", + q->subvendor, q->subdevice); + val = 0; + } + } +#endif /* CONFIG_PM */ + snd_hda_set_power_save(&chip->bus, val * 1000); +} + /* number of codec slots for each chipset: 0 = default slots (i.e. 4) */ static unsigned int azx_max_codecs[AZX_NUM_DRIVERS] = { [AZX_DRIVER_NVIDIA] = 8, @@ -2241,9 +2301,7 @@ static int azx_probe_continue(struct azx *chip) struct hda_intel *hda = container_of(chip, struct hda_intel, chip); struct hdac_bus *bus = azx_bus(chip); struct pci_dev *pci = chip->pci; - struct hda_codec *codec; int dev = chip->dev_index; - int val; int err; hda->probe_continued = 1; @@ -2322,31 +2380,13 @@ static int azx_probe_continue(struct azx *chip) if (err < 0) goto out_free; + setup_vga_switcheroo_runtime_pm(chip); + chip->running = 1; azx_add_card_list(chip); - val = power_save; -#ifdef CONFIG_PM - if (pm_blacklist) { - const struct snd_pci_quirk *q; - - q = snd_pci_quirk_lookup(chip->pci, power_save_blacklist); - if (q && val) { - dev_info(chip->card->dev, "device %04x:%04x is on the power_save blacklist, forcing power_save to 0\n", - q->subvendor, q->subdevice); - val = 0; - } - } -#endif /* CONFIG_PM */ - /* - * The discrete GPU cannot power down unless the HDA controller runtime - * suspends, so activate runtime PM on codecs even if power_save == 0. - */ - if (use_vga_switcheroo(hda)) - list_for_each_codec(codec, &chip->bus) - codec->auto_runtime_pm = 1; + set_default_power_save(chip); - snd_hda_set_power_save(&chip->bus, val * 1000); if (azx_has_pm_runtime(chip)) pm_runtime_put_autosuspend(&pci->dev); diff --git a/sound/pci/hda/hda_intel.h b/sound/pci/hda/hda_intel.h index e3a3d318d2e5..f59719e06b91 100644 --- a/sound/pci/hda/hda_intel.h +++ b/sound/pci/hda/hda_intel.h @@ -37,6 +37,7 @@ 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 */ -- 2.18.0

3 4