aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2016-02-05 14:12:24 -0500
committerTakashi Iwai <tiwai@suse.de>2016-02-05 14:19:00 -0500
commit6c361d10e0eb859233c71954abcd20d2d8700587 (patch)
tree7a2aaeefa12edd6f7fe24a10a1dd469d064bab6b
parent56661a2ed5348f3d7a3ac8788656654dd50904cd (diff)
Revert "ALSA: hda - Fix noise on Gigabyte Z170X mobo"
This reverts commit 0c25ad80408e95e0a4fbaf0056950206e95f726f. The original commit disabled the aamixer path due to the noise problem, but it turned out that some mobo with the same PCI SSID doesn't suffer from the issue, and the disabled function (analog loopback) is still demanded by users. Since the recent commit [e7fdd52779a6: ALSA: hda - Implement loopback control switch for Realtek and other codecs], we have the dynamic mixer switch to enable/disable the aamix path, and we don't have to disable the path statically any longer. So, let's revert the disablement, so that only the user suffering from the noise problem can turn off the aamix on the fly. Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=108301 Reported-by: <mutedbytes@gmail.com> Cc: <stable@vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--sound/pci/hda/patch_realtek.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 21992fb7035d..a733e5dc701d 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -1787,7 +1787,6 @@ enum {
1787 ALC882_FIXUP_NO_PRIMARY_HP, 1787 ALC882_FIXUP_NO_PRIMARY_HP,
1788 ALC887_FIXUP_ASUS_BASS, 1788 ALC887_FIXUP_ASUS_BASS,
1789 ALC887_FIXUP_BASS_CHMAP, 1789 ALC887_FIXUP_BASS_CHMAP,
1790 ALC882_FIXUP_DISABLE_AAMIX,
1791}; 1790};
1792 1791
1793static void alc889_fixup_coef(struct hda_codec *codec, 1792static void alc889_fixup_coef(struct hda_codec *codec,
@@ -1949,8 +1948,6 @@ static void alc882_fixup_no_primary_hp(struct hda_codec *codec,
1949 1948
1950static void alc_fixup_bass_chmap(struct hda_codec *codec, 1949static void alc_fixup_bass_chmap(struct hda_codec *codec,
1951 const struct hda_fixup *fix, int action); 1950 const struct hda_fixup *fix, int action);
1952static void alc_fixup_disable_aamix(struct hda_codec *codec,
1953 const struct hda_fixup *fix, int action);
1954 1951
1955static const struct hda_fixup alc882_fixups[] = { 1952static const struct hda_fixup alc882_fixups[] = {
1956 [ALC882_FIXUP_ABIT_AW9D_MAX] = { 1953 [ALC882_FIXUP_ABIT_AW9D_MAX] = {
@@ -2188,10 +2185,6 @@ static const struct hda_fixup alc882_fixups[] = {
2188 .type = HDA_FIXUP_FUNC, 2185 .type = HDA_FIXUP_FUNC,
2189 .v.func = alc_fixup_bass_chmap, 2186 .v.func = alc_fixup_bass_chmap,
2190 }, 2187 },
2191 [ALC882_FIXUP_DISABLE_AAMIX] = {
2192 .type = HDA_FIXUP_FUNC,
2193 .v.func = alc_fixup_disable_aamix,
2194 },
2195}; 2188};
2196 2189
2197static const struct snd_pci_quirk alc882_fixup_tbl[] = { 2190static const struct snd_pci_quirk alc882_fixup_tbl[] = {
@@ -2259,7 +2252,6 @@ static const struct snd_pci_quirk alc882_fixup_tbl[] = {
2259 SND_PCI_QUIRK(0x1462, 0x7350, "MSI-7350", ALC889_FIXUP_CD), 2252 SND_PCI_QUIRK(0x1462, 0x7350, "MSI-7350", ALC889_FIXUP_CD),
2260 SND_PCI_QUIRK_VENDOR(0x1462, "MSI", ALC882_FIXUP_GPIO3), 2253 SND_PCI_QUIRK_VENDOR(0x1462, "MSI", ALC882_FIXUP_GPIO3),
2261 SND_PCI_QUIRK(0x1458, 0xa002, "Gigabyte EP45-DS3/Z87X-UD3H", ALC889_FIXUP_FRONT_HP_NO_PRESENCE), 2254 SND_PCI_QUIRK(0x1458, 0xa002, "Gigabyte EP45-DS3/Z87X-UD3H", ALC889_FIXUP_FRONT_HP_NO_PRESENCE),
2262 SND_PCI_QUIRK(0x1458, 0xa182, "Gigabyte Z170X-UD3", ALC882_FIXUP_DISABLE_AAMIX),
2263 SND_PCI_QUIRK(0x147b, 0x107a, "Abit AW9D-MAX", ALC882_FIXUP_ABIT_AW9D_MAX), 2255 SND_PCI_QUIRK(0x147b, 0x107a, "Abit AW9D-MAX", ALC882_FIXUP_ABIT_AW9D_MAX),
2264 SND_PCI_QUIRK_VENDOR(0x1558, "Clevo laptop", ALC882_FIXUP_EAPD), 2256 SND_PCI_QUIRK_VENDOR(0x1558, "Clevo laptop", ALC882_FIXUP_EAPD),
2265 SND_PCI_QUIRK(0x161f, 0x2054, "Medion laptop", ALC883_FIXUP_EAPD), 2257 SND_PCI_QUIRK(0x161f, 0x2054, "Medion laptop", ALC883_FIXUP_EAPD),