diff options
| author | Takashi Iwai <tiwai@suse.de> | 2016-03-21 12:36:44 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2016-03-28 09:38:40 +0200 |
| commit | 44bb6d0c3f690e60670517859925417bd7c42a22 (patch) | |
| tree | 2bc4d13e893385813806879b47cc53b26774d8c0 /sound/pci | |
| parent | a686632fd9a857776798f3479e2b58b07d938076 (diff) | |
| download | linux-44bb6d0c3f690e60670517859925417bd7c42a22.tar.gz linux-44bb6d0c3f690e60670517859925417bd7c42a22.tar.bz2 linux-44bb6d0c3f690e60670517859925417bd7c42a22.zip | |
ALSA: hda - Apply AMP fix in hdmi_setup_audio_infoframe() generically
The need for reprogramming the AMP mute bit at each audio info frame
setup isn't always specific to Intel chips. It's safer to set it
generically for all codecs with the amp bit, as this verb execution
itself isn't too much load. This eliminates one usage of
is_haswell_plus() macro, after all.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci')
| -rw-r--r-- | sound/pci/hda/patch_hdmi.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index 48c63fea7018..fcd207d3ce7d 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -683,7 +683,8 @@ static void hdmi_setup_audio_infoframe(struct hda_codec *codec, if (!channels) return; - if (is_haswell_plus(codec)) + /* some HW (e.g. HSW+) needs reprogramming the amp at each time */ + if (get_wcaps(codec, pin_nid) & AC_WCAP_OUT_AMP) snd_hda_codec_write(codec, pin_nid, 0, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE); |