Skip to contentSkip to conversation

ALSA: hda: Re-add dropped snd_poewr_change_state() calls

PATCH New Takashi Iwai 1 participant 2 messages Mar 29, 2021 Sound

lore
Share & tools
lore

Takashi Iwai

author
#0 lore raw

PATCH 1/2 ALSA: hda: Re-add dropped snd_poewr_change_state() calls

The card power state change via snd_power_change_state() at the system suspend/resume seems dropped mistakenly during the PM code rewrite. The card power state doesn't play much role nowadays but it's still referred in a few places such as the HDMI codec driver.

This patch restores them, but in a more appropriate place now in the prepare and complete callbacks.

Fixes f5dac54d9d93 ("ALSA: hda: Separate runtime and system suspend")
Cc <[email protected]>
Signed-off-by Takashi Iwai <[email protected]>
---
 sound/pci/hda/hda_intel.c | 2 ++
 1 file changed, 2 insertions(+)
sound/pci/hda/hda_intel.c +2 -0
index 5b492c3f816c..12e51ac973c4 100644
@@ -1025,6 +1025,7 @@ static int azx_prepare(struct device *dev)
 
 	chip = card->private_data;
 	chip->pm_prepared = 1;
+	snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
 
 	/* HDA controller always requires different WAKEEN for runtime suspend
 	 * and system suspend, so don't use direct-complete here.

@@ -1038,6 +1039,7 @@ static void azx_complete(struct device *dev)
 	struct azx *chip;
 
 	chip = card->private_data;
+	snd_power_change_state(card, SNDRV_CTL_POWER_D0);
 	chip->pm_prepared = 0;
 }
Signature · 1 line
2.26.2
author
#1 lore raw

PATCH 2/2 ALSA: hda: Add missing sanity checks in PM prepare/complete callbacks

The recently added PM prepare and complete callbacks don't have the sanity check whether the card instance has been properly initialized, which may potentially lead to Oops.

This patch adds the azx_is_pm_ready() call in each place appropriately like other PM callbacks.

Fixes f5dac54d9d93 ("ALSA: hda: Separate runtime and system suspend")
Cc <[email protected]>
Signed-off-by Takashi Iwai <[email protected]>
---
 sound/pci/hda/hda_intel.c | 6 ++++++
 1 file changed, 6 insertions(+)
sound/pci/hda/hda_intel.c +6 -0
index 12e51ac973c4..8a74b5818e91 100644
@@ -1023,6 +1023,9 @@ static int azx_prepare(struct device *dev)
 	struct snd_card *card = dev_get_drvdata(dev);
 	struct azx *chip;
 
+	if (!azx_is_pm_ready(card))
+		return 0;
+
 	chip = card->private_data;
 	chip->pm_prepared = 1;
 	snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);

@@ -1038,6 +1041,9 @@ static void azx_complete(struct device *dev)
 	struct snd_card *card = dev_get_drvdata(dev);
 	struct azx *chip;
 
+	if (!azx_is_pm_ready(card))
+		return;
+
 	chip = card->private_data;
 	snd_power_change_state(card, SNDRV_CTL_POWER_D0);
 	chip->pm_prepared = 0;
Signature · 1 line
2.26.2