Commit 886e8316 authored by Takashi Iwai's avatar Takashi Iwai Committed by Greg Kroah-Hartman

ALSA: hda - Record the current power state before suspend/resume calls

commit 98081ca62cbac31fb0f7efaf90b2e7384ce22257 upstream.

Currently we deal with single codec and suspend codec callbacks for
all S3, S4 and runtime PM handling.  But it turned out that we want
distinguish the call patterns sometimes, e.g. for applying some init
sequence only at probing and restoring from hibernate.

This patch slightly modifies the common PM callbacks for HD-audio
codec and stores the currently processed PM event in power_state of
the codec's device.power field, which is currently unused.  The codec
callback can take a look at this event value and judges which purpose
it's being called.
Signed-off-by: 's avatarTakashi Iwai <>
Signed-off-by: 's avatarGreg Kroah-Hartman <>
parent 4a195a0b
......@@ -2900,6 +2900,7 @@ static void hda_call_codec_resume(struct hda_codec *codec)
codec-> = PMSG_ON;
......@@ -2932,10 +2933,48 @@ static int hda_codec_runtime_resume(struct device *dev)
#endif /* CONFIG_PM */
static int hda_codec_pm_suspend(struct device *dev)
dev->power.power_state = PMSG_SUSPEND;
return pm_runtime_force_suspend(dev);
static int hda_codec_pm_resume(struct device *dev)
dev->power.power_state = PMSG_RESUME;
return pm_runtime_force_resume(dev);
static int hda_codec_pm_freeze(struct device *dev)
dev->power.power_state = PMSG_FREEZE;
return pm_runtime_force_suspend(dev);
static int hda_codec_pm_thaw(struct device *dev)
dev->power.power_state = PMSG_THAW;
return pm_runtime_force_resume(dev);
static int hda_codec_pm_restore(struct device *dev)
dev->power.power_state = PMSG_RESTORE;
return pm_runtime_force_resume(dev);
#endif /* CONFIG_PM_SLEEP */
/* referred in hda_bind.c */
const struct dev_pm_ops hda_codec_driver_pm = {
.suspend = hda_codec_pm_suspend,
.resume = hda_codec_pm_resume,
.freeze = hda_codec_pm_freeze,
.thaw = hda_codec_pm_thaw,
.poweroff = hda_codec_pm_suspend,
.restore = hda_codec_pm_restore,
#endif /* CONFIG_PM_SLEEP */
SET_RUNTIME_PM_OPS(hda_codec_runtime_suspend, hda_codec_runtime_resume,
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