At Tue, 16 Oct 2007 10:39:55 +0300, Vasily Khoruzhick wrote:

[1 <text/plain; iso-8859-1 (quoted-printable)>] On Monday 15 October 2007 23:34:21 Peter Skensved wrote:

...

...

Hmm, the code logic looks correct to me.  If HP jack is present, the internal speaker should be muted.  Otherwise it follows the state of HP jack (muted/unmuted, that acts as a master switch)

Code logic is broken. Internal speakers muted while jack unplugged and unmuted while it's plugged.

No, it's the wrong logic. The internal speaker should be unmuted when HP is unplugged, and muted when plugged. You don't want to hear from both at the same time.

See attached original patch.

And if that patch works, then it simply means that the HP jack detection is reversed, not about the code logic.

Takashi

[2 hdaintel-laptop-eapd-updated.patch <text/x-diff; iso-8859-1 (7bit)>] --- alsa-driver-1.0.14-orig/alsa-kernel/pci/hda/patch_analog.c 2007-06-04 02:28:53.000000000 +0000 +++ alsa-driver-1.0.14/alsa-kernel/pci/hda/patch_analog.c 2007-08-29 00:32:52.000000000 +0000 @@ -497,6 +497,7 @@ /*

• mixers

*/

static struct snd_kcontrol_new ad1986a_mixers[] = { { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, @@ -628,18 +629,65 @@ struct hda_codec *codec = snd_kcontrol_chip(kcontrol); long *valp = ucontrol->value.integer.value; int change;

• unsigned int present;

• present = snd_hda_codec_read(codec, 0x1a, 0,

• 		     AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
  
  

• /* HP (0x1a) */ change = snd_hda_codec_amp_update(codec, 0x1a, 0, HDA_OUTPUT, 0, 0x80, valp[0] ? 0 : 0x80); change |= snd_hda_codec_amp_update(codec, 0x1a, 1, HDA_OUTPUT, 0, 0x80, valp[1] ? 0 : 0x80);

• /* Line-Out (0x1b) */ snd_hda_codec_amp_update(codec, 0x1b, 0, HDA_OUTPUT, 0,

• 		 0x80, valp[0] ? 0 : 0x80);
  

• 		 0x80, (valp[0] && present) ? 0 : 0x80);
  

  snd_hda_codec_amp_update(codec, 0x1b, 1, HDA_OUTPUT, 0,

• 		 0x80, valp[1] ? 0 : 0x80);
  

• 		 0x80, (valp[1] && present) ? 0 : 0x80);
  

• return change;

}

+/* mute internal speakers if HP is plugged */ +static void ad1986a_laptop_eapd_automute(struct hda_codec *codec) +{

• unsigned int present, sw;
• present = snd_hda_codec_read(codec, 0x1a, 0,

• 		     AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
  

• /*

• * TODO: get kcontrol value for "Master Playback Switch" and
  

• * enable Line-Out only if (present && sw), where sw means "unmute"
  

• *
  

• * Currently the Line-Out is unmuted when we unplug HP jack, even if we
  

• * asked to mute Master Volume.
  

• */
  

• sw = 1;
• /* Line-Out */
• snd_hda_codec_amp_update(codec, 0x1b, 0, HDA_OUTPUT, 0,

• 		 0x80, (present && sw) ? 0 : 0x80);
  

• snd_hda_codec_amp_update(codec, 0x1b, 1, HDA_OUTPUT, 0,

• 		 0x80, (present && sw) ? 0 : 0x80);
  

+}

+/* unsolicited event for HP jack sensing */ +static void ad1986a_laptop_eapd_unsol_event(struct hda_codec *codec,

• 			    unsigned int res)
  

+{

• ad1986a_laptop_eapd_automute(codec);

+}

+/* initialize jack-sensing, too */ +static int ad1986a_laptop_eapd_init(struct hda_codec *codec) +{

• ad198x_init(codec);
• ad1986a_laptop_eapd_automute(codec);
• return 0;

+}

static struct hda_input_mux ad1986a_laptop_eapd_capture_source = { .num_items = 3, .items = { @@ -749,6 +797,8 @@ {0x22, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20 }, {0x23, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20 }, {0x24, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20 },

• /* HP pin event */
• {0x1a, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN}, { } /* end */

};

@@ -913,6 +963,10 @@ spec->multiout.dac_nids = ad1986a_laptop_dac_nids; spec->multiout.dig_out_nid = 0; spec->input_mux = &ad1986a_laptop_eapd_capture_source;

• /* add some ad1986a specific operations */
  

• codec->patch_ops.init = ad1986a_laptop_eapd_init;
  

• codec->patch_ops.unsol_event = ad1986a_laptop_eapd_unsol_event;
  

  break; case AD1986A_ULTRA: spec->mixers[0] = ad1986a_laptop_eapd_mixers;

[3 <text/plain; us-ascii (7bit)>] _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

At Mon, 15 Oct 2007 16:34:21 -0400, Peter Skensved wrote:

On Mon, Oct 15, 2007 at 01:29:50PM +0200, Takashi Iwai wrote:

...

At Sun, 14 Oct 2007 22:53:03 -0400, Peter Skensved wrote:

...

 Hi,

I've come across a problem with the 1.0.15rc3 alsa driver on my Lenovo 3000 N100 laptop using the auto mute feature - it appears to work backwards ! Plugging in the headphones unmutes the external speakers and unplugging the heaphones mutes them ...

Changing the if statement in line ~600 in patch_analog.c in ad1986a_update_hp to

if (!spec->jack_preset)

makes it work the intended way. ( spec->jack_present changes state _before_ the call to ad1986a_hp_automute )

Hmm, the code logic looks correct to me. If HP jack is present, the internal speaker should be muted. Otherwise it follows the state of HP jack (muted/unmuted, that acts as a master switch).

Well - in the default mode the jack is present and the internal speakers are permanently muted until I plug in a set of headphones no matter how I toggle the speaker mute in the mixer.

With headphones plugged in I can mute and unmute the internal speakers in alsa mixer

Surely the default cannot be that I have to carry a set of headphones with my laptop all the time ???!!???

...

Is jack_present set/reset correctly when HP jack is plugged/unplugged at all? Or, the pin NID is swapped, or any other reason?

I sprinkled some printk's in the driver : On entry to ad1986a_update_hp : plugging headphones into jack : spec->jack_present = 0 removing headphones from jack : spec->jack_present = 1

This implies rather that the jack detection itself is reversed from the standard. Could you try the patch below?

thanks,

Takashi

diff -r 29661bff769f pci/hda/patch_analog.c --- a/pci/hda/patch_analog.c Mon Oct 15 10:36:45 2007 +0200 +++ b/pci/hda/patch_analog.c Tue Oct 16 10:38:09 2007 +0200 @@ -612,7 +612,8 @@ static void ad1986a_hp_automute(struct h unsigned int present;

present = snd_hda_codec_read(codec, 0x1a, 0, AC_VERB_GET_PIN_SENSE, 0); - spec->jack_present = (present & 0x80000000) != 0; + /* Lenovo N100 seems to report the reversed bit for HP jack-sensing */ + spec->jack_present = !(present & 0x80000000); ad1986a_update_hp(codec); }