| From a2c25e68c3f79c8e19509424a66364c885194951 Mon Sep 17 00:00:00 2001 |
| From: Hui Wang <hui.wang@canonical.com> |
| Date: Tue, 14 Apr 2020 22:27:25 +0800 |
| Subject: [PATCH] ALSA: hda: call runtime_allow() for all hda controllers |
| |
| commit 9a6418487b566503c772cb6e7d3d44e652b019b0 upstream. |
| |
| Before the pci_driver->probe() is called, the pci subsystem calls |
| runtime_forbid() and runtime_get_sync() on this pci dev, so only call |
| runtime_put_autosuspend() is not enough to enable the runtime_pm on |
| this device. |
| |
| For controllers with vgaswitcheroo feature, the pci/quirks.c will call |
| runtime_allow() for this dev, then the controllers could enter |
| rt_idle/suspend/resume, but for non-vgaswitcheroo controllers like |
| Intel hda controllers, the runtime_pm is not enabled because the |
| runtime_allow() is not called. |
| |
| Since it is no harm calling runtime_allow() twice, here let hda |
| driver call runtime_allow() for all controllers. Then the runtime_pm |
| is enabled on all controllers after the put_autosuspend() is called. |
| |
| Signed-off-by: Hui Wang <hui.wang@canonical.com> |
| Link: https://lore.kernel.org/r/20200414142725.6020-1-hui.wang@canonical.com |
| Signed-off-by: Takashi Iwai <tiwai@suse.de> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c |
| index 7d1f0b902589..ab3550a22fcf 100644 |
| --- a/sound/pci/hda/hda_intel.c |
| +++ b/sound/pci/hda/hda_intel.c |
| @@ -2331,6 +2331,7 @@ static int azx_probe_continue(struct azx *chip) |
| |
| if (azx_has_pm_runtime(chip)) { |
| pm_runtime_use_autosuspend(&pci->dev); |
| + pm_runtime_allow(&pci->dev); |
| pm_runtime_put_autosuspend(&pci->dev); |
| } |
| |
| -- |
| 2.7.4 |
| |
