diff mbox

[RfC] ALSA: hda/realtek PCI quirk for Fujitsu U7[25]7

Message ID 791b9188-c136-dd65-61c2-cb2e93d52876@fbihome.de (mailing list archive)
State New, archived
Headers show

Commit Message

Jan-Marek Glogowski Feb. 13, 2018, 2:21 p.m. UTC 
Am 13.02.2018 um 12:11 schrieb Takashi Iwai:
> The driver doesn't check any difference of the position for
> identifying the jack detection capability, so you can apply the same
> quirk to both models.  Then I prefer putting with SND_PCI_QUIRK().

So the patch is implemented in the spirit of what I actually did when analysing an fixing the bug via hdajackretask. Instead of fixed numbers, it takes the original headphone pin, changes the device to microphone and updates the mics' pin config.

Regards,

Jan-Marek

---

From 24abbbd83bf5c47e3396483b0d5287ac8f48cecd Mon Sep 17 00:00:00 2001
From: Jan-Marek Glogowski <jan-marek.glogowski@muenchen.de>
Date: Wed, 24 Jan 2018 18:57:38 +0100
Subject: [PATCH] ALSA: hda/realtek: PCI quirk for Fujitsu U7x7

These laptops have a combined jack to attach headsets, the U727 on
the left, the U757 on the right, but a headsets microphone doesn't
work. Using hdajacksensetest I found that pin 0x19 changed the
present state when plugging the headset, in addition to 0x21, but
didn't have the correct configuration (shown as "Not connected").

So this sets the configuration to the same values as the headphone
pin 0x21 except for the device type microphone, which makes it
work correctly. With the patch the configured pins for U727 are

Pin 0x12 (Internal Mic, Mobile-In): present = No
Pin 0x14 (Internal Speaker): present = No
Pin 0x19 (Black Mic, Left side): present = No
Pin 0x1d (Internal Aux): present = No
Pin 0x21 (Black Headphone, Left side): present = No

Signed-off-by: Jan-Marek Glogowski <glogow@fbihome.de>
---
 sound/pci/hda/patch_realtek.c | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

Comments

Takashi Iwai Feb. 13, 2018, 2:48 p.m. UTC | #1 
On Tue, 13 Feb 2018 15:21:48 +0100,
Jan-Marek Glogowski wrote:
> 
> Am 13.02.2018 um 12:11 schrieb Takashi Iwai:
> > The driver doesn't check any difference of the position for
> > identifying the jack detection capability, so you can apply the same
> > quirk to both models.  Then I prefer putting with SND_PCI_QUIRK().
> 
> So the patch is implemented in the spirit of what I actually did when analysing an fixing the bug via hdajackretask. Instead of fixed numbers, it takes the original headphone pin, changes the device to microphone and updates the mics' pin config.

The new patch looks better, but could you try to address warnings by
checkpatch.pl?  The 80-chars warning for SND_PCI_QUIRK() line can be
ignored.


thanks,

Takashi

> 
> Regards,
> 
> Jan-Marek
> 
> ---
> 
> >From 24abbbd83bf5c47e3396483b0d5287ac8f48cecd Mon Sep 17 00:00:00 2001
> From: Jan-Marek Glogowski <jan-marek.glogowski@muenchen.de>
> Date: Wed, 24 Jan 2018 18:57:38 +0100
> Subject: [PATCH] ALSA: hda/realtek: PCI quirk for Fujitsu U7x7
> 
> These laptops have a combined jack to attach headsets, the U727 on
> the left, the U757 on the right, but a headsets microphone doesn't
> work. Using hdajacksensetest I found that pin 0x19 changed the
> present state when plugging the headset, in addition to 0x21, but
> didn't have the correct configuration (shown as "Not connected").
> 
> So this sets the configuration to the same values as the headphone
> pin 0x21 except for the device type microphone, which makes it
> work correctly. With the patch the configured pins for U727 are
> 
> Pin 0x12 (Internal Mic, Mobile-In): present = No
> Pin 0x14 (Internal Speaker): present = No
> Pin 0x19 (Black Mic, Left side): present = No
> Pin 0x1d (Internal Aux): present = No
> Pin 0x21 (Black Headphone, Left side): present = No
> 
> Signed-off-by: Jan-Marek Glogowski <glogow@fbihome.de>
> ---
>  sound/pci/hda/patch_realtek.c | 19 +++++++++++++++++++
>  1 file changed, 19 insertions(+)
> 
> diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
> index 2347588..a47b15f 100644
> --- a/sound/pci/hda/patch_realtek.c
> +++ b/sound/pci/hda/patch_realtek.c
> @@ -3465,6 +3465,19 @@ static void alc269_fixup_pincfg_no_hp_to_lineout(struct hda_codec *codec,
>  		spec->parse_flags = HDA_PINCFG_NO_HP_FIXUP;
>  }
>  
> +static void alc269_fixup_pincfg_U7x7_headset_mic(struct hda_codec *codec,
> +						 const struct hda_fixup *fix, int action)
> +{
> +	unsigned int cfg_headphone = snd_hda_codec_get_pincfg(codec, 0x21);
> +	unsigned int cfg_headset_mic = snd_hda_codec_get_pincfg(codec, 0x19);
> +
> +	if (cfg_headphone && cfg_headset_mic == 0x411111f0)
> +		// same config, but a mic instead of a headphone
> +		snd_hda_codec_set_pincfg(codec, 0x19,
> +			(cfg_headphone & ~AC_DEFCFG_DEVICE) +
> +			(AC_JACK_MIC_IN << AC_DEFCFG_DEVICE_SHIFT));
> +}
> +
>  static void alc269_fixup_hweq(struct hda_codec *codec,
>  			       const struct hda_fixup *fix, int action)
>  {
> @@ -5351,6 +5364,7 @@ enum {
>  	ALC269_FIXUP_LIFEBOOK_EXTMIC,
>  	ALC269_FIXUP_LIFEBOOK_HP_PIN,
>  	ALC269_FIXUP_LIFEBOOK_NO_HP_TO_LINEOUT,
> +	ALC255_FIXUP_LIFEBOOK_U7x7_HEADSET_MIC,
>  	ALC269_FIXUP_AMIC,
>  	ALC269_FIXUP_DMIC,
>  	ALC269VB_FIXUP_AMIC,
> @@ -5556,6 +5570,10 @@ static const struct hda_fixup alc269_fixups[] = {
>  		.type = HDA_FIXUP_FUNC,
>  		.v.func = alc269_fixup_pincfg_no_hp_to_lineout,
>  	},
> +	[ALC255_FIXUP_LIFEBOOK_U7x7_HEADSET_MIC] = {
> +		.type = HDA_FIXUP_FUNC,
> +		.v.func = alc269_fixup_pincfg_U7x7_headset_mic,
> +	},
>  	[ALC269_FIXUP_AMIC] = {
>  		.type = HDA_FIXUP_PINS,
>  		.v.pins = (const struct hda_pintbl[]) {
> @@ -6422,6 +6440,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
>  	SND_PCI_QUIRK(0x10cf, 0x159f, "Lifebook E780", ALC269_FIXUP_LIFEBOOK_NO_HP_TO_LINEOUT),
>  	SND_PCI_QUIRK(0x10cf, 0x15dc, "Lifebook T731", ALC269_FIXUP_LIFEBOOK_HP_PIN),
>  	SND_PCI_QUIRK(0x10cf, 0x1757, "Lifebook E752", ALC269_FIXUP_LIFEBOOK_HP_PIN),
> +	SND_PCI_QUIRK(0x10cf, 0x1629, "Lifebook U7x7", ALC255_FIXUP_LIFEBOOK_U7x7_HEADSET_MIC),
>  	SND_PCI_QUIRK(0x10cf, 0x1845, "Lifebook U904", ALC269_FIXUP_LIFEBOOK_EXTMIC),
>  	SND_PCI_QUIRK(0x10ec, 0x10f2, "Intel Reference board", ALC700_FIXUP_INTEL_REFERENCE),
>  	SND_PCI_QUIRK(0x144d, 0xc109, "Samsung Ativ book 9 (NP900X3G)", ALC269_FIXUP_INV_DMIC),
> -- 
> 2.1.4
>
diff mbox

Patch

diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 2347588..a47b15f 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -3465,6 +3465,19 @@  static void alc269_fixup_pincfg_no_hp_to_lineout(struct hda_codec *codec,
 		spec->parse_flags = HDA_PINCFG_NO_HP_FIXUP;
 }
 
+static void alc269_fixup_pincfg_U7x7_headset_mic(struct hda_codec *codec,
+						 const struct hda_fixup *fix, int action)
+{
+	unsigned int cfg_headphone = snd_hda_codec_get_pincfg(codec, 0x21);
+	unsigned int cfg_headset_mic = snd_hda_codec_get_pincfg(codec, 0x19);
+
+	if (cfg_headphone && cfg_headset_mic == 0x411111f0)
+		// same config, but a mic instead of a headphone
+		snd_hda_codec_set_pincfg(codec, 0x19,
+			(cfg_headphone & ~AC_DEFCFG_DEVICE) +
+			(AC_JACK_MIC_IN << AC_DEFCFG_DEVICE_SHIFT));
+}
+
 static void alc269_fixup_hweq(struct hda_codec *codec,
 			       const struct hda_fixup *fix, int action)
 {
@@ -5351,6 +5364,7 @@  enum {
 	ALC269_FIXUP_LIFEBOOK_EXTMIC,
 	ALC269_FIXUP_LIFEBOOK_HP_PIN,
 	ALC269_FIXUP_LIFEBOOK_NO_HP_TO_LINEOUT,
+	ALC255_FIXUP_LIFEBOOK_U7x7_HEADSET_MIC,
 	ALC269_FIXUP_AMIC,
 	ALC269_FIXUP_DMIC,
 	ALC269VB_FIXUP_AMIC,
@@ -5556,6 +5570,10 @@  static const struct hda_fixup alc269_fixups[] = {
 		.type = HDA_FIXUP_FUNC,
 		.v.func = alc269_fixup_pincfg_no_hp_to_lineout,
 	},
+	[ALC255_FIXUP_LIFEBOOK_U7x7_HEADSET_MIC] = {
+		.type = HDA_FIXUP_FUNC,
+		.v.func = alc269_fixup_pincfg_U7x7_headset_mic,
+	},
 	[ALC269_FIXUP_AMIC] = {
 		.type = HDA_FIXUP_PINS,
 		.v.pins = (const struct hda_pintbl[]) {
@@ -6422,6 +6440,7 @@  static const struct snd_pci_quirk alc269_fixup_tbl[] = {
 	SND_PCI_QUIRK(0x10cf, 0x159f, "Lifebook E780", ALC269_FIXUP_LIFEBOOK_NO_HP_TO_LINEOUT),
 	SND_PCI_QUIRK(0x10cf, 0x15dc, "Lifebook T731", ALC269_FIXUP_LIFEBOOK_HP_PIN),
 	SND_PCI_QUIRK(0x10cf, 0x1757, "Lifebook E752", ALC269_FIXUP_LIFEBOOK_HP_PIN),
+	SND_PCI_QUIRK(0x10cf, 0x1629, "Lifebook U7x7", ALC255_FIXUP_LIFEBOOK_U7x7_HEADSET_MIC),
 	SND_PCI_QUIRK(0x10cf, 0x1845, "Lifebook U904", ALC269_FIXUP_LIFEBOOK_EXTMIC),
 	SND_PCI_QUIRK(0x10ec, 0x10f2, "Intel Reference board", ALC700_FIXUP_INTEL_REFERENCE),
 	SND_PCI_QUIRK(0x144d, 0xc109, "Samsung Ativ book 9 (NP900X3G)", ALC269_FIXUP_INV_DMIC),