ALSA: hda/sigmatel: Keep power up while beep is enabled

[ Upstream commit 414d38ba871092aeac4ed097ac4ced89486646f7 ]

It seems that the beep playback doesn't work well on IDT codec devices
when the codec auto-pm is enabled.  Keep the power on while the beep
switch is enabled.

Link: https://bugzilla.suse.com/show_bug.cgi?id=1200544
Link: https://lore.kernel.org/r/20220904072750.26164-1-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Takashi Iwai
2022-09-04 09:27:50 +02:00
committed by Greg Kroah-Hartman
parent b95a5ef4c0
commit e41b97a277

View File

@@ -209,6 +209,7 @@ struct sigmatel_spec {
/* beep widgets */ /* beep widgets */
hda_nid_t anabeep_nid; hda_nid_t anabeep_nid;
bool beep_power_on;
/* SPDIF-out mux */ /* SPDIF-out mux */
const char * const *spdif_labels; const char * const *spdif_labels;
@@ -4447,6 +4448,26 @@ static int stac_suspend(struct hda_codec *codec)
stac_shutup(codec); stac_shutup(codec);
return 0; return 0;
} }
static int stac_check_power_status(struct hda_codec *codec, hda_nid_t nid)
{
struct sigmatel_spec *spec = codec->spec;
int ret = snd_hda_gen_check_power_status(codec, nid);
#ifdef CONFIG_SND_HDA_INPUT_BEEP
if (nid == spec->gen.beep_nid && codec->beep) {
if (codec->beep->enabled != spec->beep_power_on) {
spec->beep_power_on = codec->beep->enabled;
if (spec->beep_power_on)
snd_hda_power_up_pm(codec);
else
snd_hda_power_down_pm(codec);
}
ret |= spec->beep_power_on;
}
#endif
return ret;
}
#else #else
#define stac_suspend NULL #define stac_suspend NULL
#endif /* CONFIG_PM */ #endif /* CONFIG_PM */
@@ -4459,6 +4480,7 @@ static const struct hda_codec_ops stac_patch_ops = {
.unsol_event = snd_hda_jack_unsol_event, .unsol_event = snd_hda_jack_unsol_event,
#ifdef CONFIG_PM #ifdef CONFIG_PM
.suspend = stac_suspend, .suspend = stac_suspend,
.check_power_status = stac_check_power_status,
#endif #endif
.reboot_notify = stac_shutup, .reboot_notify = stac_shutup,
}; };