Skip to content

Commit

Permalink
ALSA: hda: conexant: Turn off EAPD at suspend, too
Browse files Browse the repository at this point in the history
Conexant codecs have a workaround for the noise at shutdown to turn
off EAPD, but it wasn't applied at suspend.  In the later patch, we'll
switch from reboot_notify callback to the general suspend-at-shutdown,
so let's apply the workaround to the suspend case, too.

BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=214045
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Takashi Iwai <[email protected]>
  • Loading branch information
tiwai committed Aug 14, 2021
1 parent 81be109 commit 95dc85d
Showing 1 changed file with 15 additions and 1 deletion.
16 changes: 15 additions & 1 deletion sound/pci/hda/patch_conexant.c
Original file line number Diff line number Diff line change
Expand Up @@ -177,13 +177,18 @@ static int cx_auto_init(struct hda_codec *codec)
return 0;
}

static void cx_auto_reboot_notify(struct hda_codec *codec)
static void cx_auto_shutdown(struct hda_codec *codec)
{
struct conexant_spec *spec = codec->spec;

/* Turn the problematic codec into D3 to avoid spurious noises
from the internal speaker during (and after) reboot */
cx_auto_turn_eapd(codec, spec->num_eapds, spec->eapds, false);
}

static void cx_auto_reboot_notify(struct hda_codec *codec)
{
cx_auto_shutdown(codec);
snd_hda_gen_reboot_notify(codec);
}

Expand All @@ -193,6 +198,14 @@ static void cx_auto_free(struct hda_codec *codec)
snd_hda_gen_free(codec);
}

#ifdef CONFIG_PM
static int cx_auto_suspend(struct hda_codec *codec)
{
cx_auto_shutdown(codec);
return 0;
}
#endif

static const struct hda_codec_ops cx_auto_patch_ops = {
.build_controls = snd_hda_gen_build_controls,
.build_pcms = snd_hda_gen_build_pcms,
Expand All @@ -201,6 +214,7 @@ static const struct hda_codec_ops cx_auto_patch_ops = {
.free = cx_auto_free,
.unsol_event = snd_hda_jack_unsol_event,
#ifdef CONFIG_PM
.suspend = cx_auto_suspend,
.check_power_status = snd_hda_gen_check_power_status,
#endif
};
Expand Down

0 comments on commit 95dc85d

Please sign in to comment.