On Sunday 26 April 2015 18:26:59 Takashi Iwai wrote:
At Sat, 25 Apr 2015 15:57:15 +0200, Gabriele Mazzotta wrote:
On Saturday 25 April 2015 13:51:33 Gabriele Mazzotta wrote:
Hi,
I think this the patch here below is simpler than the other I sent. snd_hda_get_default_vref() guesses the vref input pins. We know that some of these are for headphones/headset mics, so we could set the vref to HIZ for these.
Are there systems that would misbehave with this change?
Gabriele
diff --git a/sound/pci/hda/hda_generic.c b/sound/pci/hda/hda_generic.c index 3d2597b..081db8b 100644 --- a/sound/pci/hda/hda_generic.c +++ b/sound/pci/hda/hda_generic.c @@ -3257,7 +3257,9 @@ static int create_input_ctls(struct hda_codec *codec) continue;
val = PIN_IN;
if (cfg->inputs[i].type == AUTO_PIN_MIC)
if (cfg->inputs[i].type == AUTO_PIN_MIC &&!cfg->inputs[i].is_headset_mic &&!cfg->inputs[i].is_headphone_mic) val |= snd_hda_get_default_vref(codec, pin);Sorry, I think I misunderstood the meaning of the two flags and they can't be used like that.
Yeah, it's a slight abuse.
How about a patch like below? This doesn't add any flag but it sets the default pin target value explicitly by the driver beforehand, and let the generic parser setting up only when uninitialized.
It's working perfectly, thanks.
Gabriele
Takashi
diff --git a/sound/pci/hda/hda_generic.c b/sound/pci/hda/hda_generic.c index 3d2597b7037b..788f969b1a68 100644 --- a/sound/pci/hda/hda_generic.c +++ b/sound/pci/hda/hda_generic.c @@ -3259,7 +3259,8 @@ static int create_input_ctls(struct hda_codec *codec) val = PIN_IN; if (cfg->inputs[i].type == AUTO_PIN_MIC) val |= snd_hda_get_default_vref(codec, pin);
if (pin != spec->hp_mic_pin)
if (pin != spec->hp_mic_pin &&!snd_hda_codec_get_pin_target(codec, pin)) set_pin_target(codec, pin, val, false);if (mixer) {
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 06199e4e930f..bd661ca62092 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -4190,11 +4190,15 @@ static void alc_shutup_dell_xps13(struct hda_codec *codec) static void alc_fixup_dell_xps13(struct hda_codec *codec, const struct hda_fixup *fix, int action) {
- if (action == HDA_FIXUP_ACT_PROBE) {
struct alc_spec *spec = codec->spec;struct hda_input_mux *imux = &spec->gen.input_mux;int i;
struct alc_spec *spec = codec->spec;
struct hda_input_mux *imux = &spec->gen.input_mux;
int i;
switch (action) {
case HDA_FIXUP_ACT_PRE_PROBE:
snd_hda_codec_set_pin_target(codec, 0x19, PIN_VREFHIZ);break;case HDA_FIXUP_ACT_PROBE: spec->shutup = alc_shutup_dell_xps13;
/* Make the internal mic the default input source. */
@@ -4204,6 +4208,7 @@ static void alc_fixup_dell_xps13(struct hda_codec *codec, break; } }
break;}