diff mbox

[Utopic,v2] ALSA: hda - Fix noisy outputs on Dell XPS13 (2015 model)

Message ID 1437360605-26126-1-git-send-email-hui.wang@canonical.com
State New
Headers show

Commit Message

Hui Wang July 20, 2015, 2:50 a.m. UTC 
From: Takashi Iwai <tiwai@suse.de>

BugLink: http://bugs.launchpad.net/bugs/1468582

The new Dell XPS13 also requires the similar quirk for fixing the
noisy outputs.  (But, as the codec was changed, now the fixup for
Latitude is used instead.)

Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=99851
Signed-off-by: Takashi Iwai <tiwai@suse.de>
(backport from commit 82d6d8a4034a7480d582791763c89c328c2a8f0c and
8b99aba70c5f581860736855e211cf981f438ad2)

[This patch merged part of commit 8b99aba7 into the commit 82d6d8a4.
The content of the commit 8b99aba7 is partly dropped, firstly I
dropped the part of adding QUIRK to two Latitude machines, since
these two machines already had MIC_PRESENCE QUIRK in the 3.16,
adding a new QUIRK will overwrite the old one; secondly I dropped
the part of changing power_save_node, since there is no this
feature in the 3.16 yet.]
Signed-off-by: Hui Wang <hui.wang@canonical.com>
---
If this patch is accepted, I will prepare the patch for trusty as well
according to this solution.

 sound/pci/hda/patch_realtek.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

Comments

Stefan Bader July 20, 2015, 6:51 a.m. UTC | #1 
This looks much better to me. That way we should be able to follow what was
going on should there ever be issues with it.
Normally, following the upstream changes should be preferred. Just in this
special case this was too complex/confusing.

-Stefan
Hui Wang July 20, 2015, 8:57 a.m. UTC | #2 
On 07/20/2015 02:51 PM, Stefan Bader wrote:
> This looks much better to me. That way we should be able to follow what was
> going on should there ever be issues with it.
> Normally, following the upstream changes should be preferred. Just in this
> special case this was too complex/confusing.
>
> -Stefan
>
>
>
Got it, thanks a lot.

Regards,
Hui.
Tim Gardner July 20, 2015, 12:16 p.m. UTC | #3
Brad Figg July 22, 2015, 4:10 p.m. UTC | #4 
Applied to the Utopic master-next branch.
diff mbox

Patch

diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index a10d51c..8cc749b 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -4317,6 +4317,8 @@  enum {
 	ALC293_FIXUP_DELL1_MIC_NO_PRESENCE,
 	ALC292_FIXUP_TPT440_DOCK,
 	ALC255_FIXUP_DELL_WMI_MIC_MUTE_LED,
+	ALC292_FIXUP_DELL_E7X,
+	ALC292_FIXUP_DISABLE_AAMIX,
 };
 
 static const struct hda_fixup alc269_fixups[] = {
@@ -4758,6 +4760,16 @@  static const struct hda_fixup alc269_fixups[] = {
 		.type = HDA_FIXUP_FUNC,
 		.v.func = alc_fixup_dell_wmi,
 	},
+	[ALC292_FIXUP_DISABLE_AAMIX] = {
+		.type = HDA_FIXUP_FUNC,
+		.v.func = alc_fixup_disable_aamix,
+	},
+	[ALC292_FIXUP_DELL_E7X] = {
+		.type = HDA_FIXUP_FUNC,
+		.v.func = alc_fixup_dell_xps13,
+		.chained = true,
+		.chain_id = ALC292_FIXUP_DISABLE_AAMIX
+	},
 };
 
 static const struct snd_pci_quirk alc269_fixup_tbl[] = {
@@ -4809,6 +4821,7 @@  static const struct snd_pci_quirk alc269_fixup_tbl[] = {
 	SND_PCI_QUIRK(0x1028, 0x063f, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE),
 	SND_PCI_QUIRK(0x1028, 0x064a, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE),
 	SND_PCI_QUIRK(0x1028, 0x064b, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE),
+	SND_PCI_QUIRK(0x1028, 0x0665, "Dell XPS 13", ALC292_FIXUP_DELL_E7X),
 	SND_PCI_QUIRK(0x1028, 0x06c7, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE),
 	SND_PCI_QUIRK(0x1028, 0x0668, "Dell", ALC255_FIXUP_DELL2_MIC_NO_PRESENCE),
 	SND_PCI_QUIRK(0x1028, 0x0669, "Dell", ALC255_FIXUP_DELL2_MIC_NO_PRESENCE),