From: Roy Spliet <nouveau@spliet.org>
Date: Mon, 13 Apr 2020 08:20:34 +0000 (+0200)
Subject: ALSA: hda: Explicitly permit using autosuspend if runtime PM is supported
X-Git-Tag: v5.7-rc2~30^2~2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=3ba21113bd33d49f3c300a23fc08cf114c434995;p=users%2Fwilly%2Flinux.git

ALSA: hda: Explicitly permit using autosuspend if runtime PM is supported

This fixes runtime PM not working after a suspend-to-RAM cycle at least for
the codec-less HDA device found on NVIDIA GPUs.

BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=207043
Signed-off-by: Roy Spliet <nouveau@spliet.org>
Link: https://lore.kernel.org/r/20200413082034.25166-7-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---

diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 02c6308502b1..8519051a426e 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -2354,8 +2354,10 @@ static int azx_probe_continue(struct azx *chip)
 
 	set_default_power_save(chip);
 
-	if (azx_has_pm_runtime(chip))
+	if (azx_has_pm_runtime(chip)) {
+		pm_runtime_use_autosuspend(&pci->dev);
 		pm_runtime_put_autosuspend(&pci->dev);
+	}
 
 out_free:
 	if (err < 0) {