Commit 9479e75f authored by Takashi Iwai's avatar Takashi Iwai

ALSA: hda: Keep the controller initialization even if no codecs found

Currently, when the HD-audio controller driver doesn't detect any
codecs, it tries to abort the probe.  But this abort happens at the
delayed probe, i.e. the primary probe call already returned success,
hence the driver is never unbound until user does so explicitly.
As a result, it may leave the HD-audio device in the running state
without the runtime PM.  More badly, if the device is a HD-audio bus
that is tied with a GPU, GPU cannot reach to the full power down and
consumes unnecessarily much power.

This patch changes the logic after no-codec situation; it continues
probing without the further codec initialization but keep the
controller driver running normally.

BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=207043Tested-by: default avatarRoy Spliet <nouveau@spliet.org>
Link: https://lore.kernel.org/r/20200413082034.25166-5-tiwai@suse.deSigned-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 2393e755
...@@ -2009,7 +2009,7 @@ static int azx_first_init(struct azx *chip) ...@@ -2009,7 +2009,7 @@ static int azx_first_init(struct azx *chip)
/* codec detection */ /* codec detection */
if (!azx_bus(chip)->codec_mask) { if (!azx_bus(chip)->codec_mask) {
dev_err(card->dev, "no codecs found!\n"); dev_err(card->dev, "no codecs found!\n");
return -ENODEV; /* keep running the rest for the runtime PM */
} }
if (azx_acquire_irq(chip, 0) < 0) if (azx_acquire_irq(chip, 0) < 0)
...@@ -2303,9 +2303,11 @@ static int azx_probe_continue(struct azx *chip) ...@@ -2303,9 +2303,11 @@ static int azx_probe_continue(struct azx *chip)
#endif #endif
/* create codec instances */ /* create codec instances */
err = azx_probe_codecs(chip, azx_max_codecs[chip->driver_type]); if (bus->codec_mask) {
if (err < 0) err = azx_probe_codecs(chip, azx_max_codecs[chip->driver_type]);
goto out_free; if (err < 0)
goto out_free;
}
#ifdef CONFIG_SND_HDA_PATCH_LOADER #ifdef CONFIG_SND_HDA_PATCH_LOADER
if (chip->fw) { if (chip->fw) {
...@@ -2319,7 +2321,7 @@ static int azx_probe_continue(struct azx *chip) ...@@ -2319,7 +2321,7 @@ static int azx_probe_continue(struct azx *chip)
#endif #endif
} }
#endif #endif
if ((probe_only[dev] & 1) == 0) { if (bus->codec_mask && !(probe_only[dev] & 1)) {
err = azx_codec_configure(chip); err = azx_codec_configure(chip);
if (err < 0) if (err < 0)
goto out_free; goto out_free;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment