[PATCH] ALSA: HDA: Create phantom jacks for fixed inputs and outputs

[PATCH] ALSA: HDA: Create phantom jacks for fixed inputs and outputs

[David Henningsson]

PulseAudio sometimes have difficulties knowing that there is a
"Speaker" or "Internal Mic", if they have no individual volume
controls or selectors. As a result, only e g "Headphone" might
be created for a laptop, but no "Speaker".
To help out, create phantom jacks (that are always present,
at least for now) for "Speaker", "Internal Mic" etc, in case we
detect them.
The naming convention is e g "Speaker Phantom Jack".

In order not to pollute the /dev/input namespace with even more
devices, these are added to the kcontrols only, not the input devices.

An implementation note:
The possibility to override how to actually do jack sensing opens
up for more advanced usage of the jack infrastructure in the future
(e g letting the headphone jack detection set presence status for
both headphone and mic in case of a headset jack, among other things).

Signed-off-by: David Henningsson <david.henningsson@canonical.com>
---
 sound/pci/hda/hda_jack.c |   64 ++++++++++++++++++++++++++++++++++------------
 sound/pci/hda/hda_jack.h |    5 ++++
 2 files changed, 52 insertions(+), 17 deletions(-)

diff --git a/sound/pci/hda/hda_jack.c b/sound/pci/hda/hda_jack.c
index 2dd1c11..c5569f1 100644
--- a/sound/pci/hda/hda_jack.c
+++ b/sound/pci/hda/hda_jack.c
@@ -133,6 +133,13 @@ static void jack_detect_update(struct hda_codec *codec,
 	}
 }
 
+static void jack_detect_always_present(struct hda_codec *codec,
+				       struct hda_jack_tbl *jack)
+{
+	jack->pin_sense = AC_PINSENSE_PRESENCE;
+	jack->jack_dirty = 0;
+}
+
 /**
  * snd_hda_set_dirty_all - Mark all the cached as dirty
  *
@@ -162,7 +169,8 @@ u32 snd_hda_pin_sense(struct hda_codec *codec, hda_nid_t nid)
 {
 	struct hda_jack_tbl *jack = snd_hda_jack_tbl_get(codec, nid);
 	if (jack) {
-		jack_detect_update(codec, jack);
+		if (jack->update_func)
+			jack->update_func(codec, jack);
 		return jack->pin_sense;
 	}
 	return read_pin_sense(codec, nid);
@@ -215,7 +223,8 @@ void snd_hda_jack_report_sync(struct hda_codec *codec)
 
 	for (i = 0; i < codec->jacktbl.used; i++, jack++)
 		if (jack->nid) {
-			jack_detect_update(codec, jack);
+			if (jack->update_func)
+				jack->update_func(codec, jack);
 			if (!jack->kctl)
 				continue;
 			state = get_jack_plug_state(jack->pin_sense);
@@ -264,8 +273,8 @@ static void hda_free_jack_priv(struct snd_jack *jack)
  * This assigns a jack-detection kctl to the given pin.  The kcontrol
  * will have the given name and index.
  */
-int snd_hda_jack_add_kctl(struct hda_codec *codec, hda_nid_t nid,
-			  const char *name, int idx)
+static int __snd_hda_jack_add_kctl(struct hda_codec *codec, hda_nid_t nid,
+			  const char *name, int idx, bool phantom_jack)
 {
 	struct hda_jack_tbl *jack;
 	struct snd_kcontrol *kctl;
@@ -283,19 +292,33 @@ int snd_hda_jack_add_kctl(struct hda_codec *codec, hda_nid_t nid,
 	if (err < 0)
 		return err;
 	jack->kctl = kctl;
+	if (phantom_jack)
+		jack->update_func = jack_detect_always_present;
+	else
+		jack->update_func = jack_detect_update;
+
 	state = snd_hda_jack_detect(codec, nid);
 	snd_kctl_jack_report(codec->bus->card, kctl, state);
 #ifdef CONFIG_SND_HDA_INPUT_JACK
-	jack->type = get_input_jack_type(codec, nid);
-	err = snd_jack_new(codec->bus->card, name, jack->type, &jack->jack);
-	if (err < 0)
-		return err;
-	jack->jack->private_data = jack;
-	jack->jack->private_free = hda_free_jack_priv;
-	snd_jack_report(jack->jack, state ? jack->type : 0);
+	if (!phantom_jack) {
+		jack->type = get_input_jack_type(codec, nid);
+		err = snd_jack_new(codec->bus->card, name, jack->type,
+				   &jack->jack);
+		if (err < 0)
+			return err;
+		jack->jack->private_data = jack;
+		jack->jack->private_free = hda_free_jack_priv;
+		snd_jack_report(jack->jack, state ? jack->type : 0);
+	}
 #endif
 	return 0;
 }
+
+int snd_hda_jack_add_kctl(struct hda_codec *codec, hda_nid_t nid,
+			  const char *name, int idx)
+{
+	return __snd_hda_jack_add_kctl(codec, nid, name, idx, false);
+}
 EXPORT_SYMBOL_HDA(snd_hda_jack_add_kctl);
 
 static int add_jack_kctl(struct hda_codec *codec, hda_nid_t nid,
@@ -305,25 +328,32 @@ static int add_jack_kctl(struct hda_codec *codec, hda_nid_t nid,
 	unsigned int def_conf, conn;
 	char name[44];
 	int idx, err;
+	bool phantom_jack;
 
 	if (!nid)
 		return 0;
-	if (!is_jack_detectable(codec, nid))
-		return 0;
 	def_conf = snd_hda_codec_get_pincfg(codec, nid);
 	conn = get_defcfg_connect(def_conf);
-	if (conn != AC_JACK_PORT_COMPLEX)
+	if (conn == AC_JACK_PORT_NONE)
 		return 0;
+	phantom_jack = (conn != AC_JACK_PORT_COMPLEX) ||
+		       !is_jack_detectable(codec, nid);
 
 	snd_hda_get_pin_label(codec, nid, cfg, name, sizeof(name), &idx);
+	if (phantom_jack)
+		/* Example final name: "Internal Mic Phantom Jack" */
+		strncat(name, " Phantom", sizeof(name) - strlen(name) - 1);
 	if (!strcmp(name, lastname) && idx == *lastidx)
 		idx++;
-	strncpy(lastname, name, 44);
+	strncpy(lastname, name, sizeof(name));
 	*lastidx = idx;
-	err = snd_hda_jack_add_kctl(codec, nid, name, idx);
+	err = __snd_hda_jack_add_kctl(codec, nid, name, idx, phantom_jack);
 	if (err < 0)
 		return err;
-	return snd_hda_jack_detect_enable(codec, nid, 0);
+
+	if (!phantom_jack)
+		return snd_hda_jack_detect_enable(codec, nid, 0);
+	return 0;
 }
 
 /**
diff --git a/sound/pci/hda/hda_jack.h b/sound/pci/hda/hda_jack.h
index 8ae5246..4055236 100644
--- a/sound/pci/hda/hda_jack.h
+++ b/sound/pci/hda/hda_jack.h
@@ -13,6 +13,10 @@
 #define __SOUND_HDA_JACK_H
 
 struct auto_pin_cfg;
+struct hda_jack_tbl;
+
+typedef void (*snd_hda_jack_detect_update)(struct hda_codec *codec,
+	       struct hda_jack_tbl *jack);
 
 struct hda_jack_tbl {
 	hda_nid_t nid;
@@ -24,6 +28,7 @@ struct hda_jack_tbl {
 	unsigned int jack_detect:1;	/* capable of jack-detection? */
 	unsigned int jack_dirty:1;	/* needs to update? */
 	struct snd_kcontrol *kctl;	/* assigned kctl for jack-detection */
+	snd_hda_jack_detect_update update_func; /* function to call to perform jack detection */
 #ifdef CONFIG_SND_HDA_INPUT_JACK
 	int type;
 	struct snd_jack *jack;
-- 
1.7.9.5

Re: [PATCH] ALSA: HDA: Create phantom jacks for fixed inputs and outputs

[Takashi Iwai]

At Thu,  7 Jun 2012 15:52:08 +0200,
David Henningsson wrote:
> 
> PulseAudio sometimes have difficulties knowing that there is a
> "Speaker" or "Internal Mic", if they have no individual volume
> controls or selectors. As a result, only e g "Headphone" might
> be created for a laptop, but no "Speaker".
> To help out, create phantom jacks (that are always present,
> at least for now) for "Speaker", "Internal Mic" etc, in case we
> detect them.
> The naming convention is e g "Speaker Phantom Jack".
> 
> In order not to pollute the /dev/input namespace with even more
> devices, these are added to the kcontrols only, not the input devices.
> 
> An implementation note:
> The possibility to override how to actually do jack sensing opens
> up for more advanced usage of the jack infrastructure in the future
> (e g letting the headphone jack detection set presence status for
> both headphone and mic in case of a headset jack, among other things).
> 
> Signed-off-by: David Henningsson <david.henningsson@canonical.com>
> ---
>  sound/pci/hda/hda_jack.c |   64 ++++++++++++++++++++++++++++++++++------------
>  sound/pci/hda/hda_jack.h |    5 ++++
>  2 files changed, 52 insertions(+), 17 deletions(-)
> 
> diff --git a/sound/pci/hda/hda_jack.c b/sound/pci/hda/hda_jack.c
> index 2dd1c11..c5569f1 100644
> --- a/sound/pci/hda/hda_jack.c
> +++ b/sound/pci/hda/hda_jack.c
> @@ -133,6 +133,13 @@ static void jack_detect_update(struct hda_codec *codec,
>  	}
>  }
>  
> +static void jack_detect_always_present(struct hda_codec *codec,
> +				       struct hda_jack_tbl *jack)
> +{
> +	jack->pin_sense = AC_PINSENSE_PRESENCE;
> +	jack->jack_dirty = 0;
> +}
> +
>  /**
>   * snd_hda_set_dirty_all - Mark all the cached as dirty
>   *
> @@ -162,7 +169,8 @@ u32 snd_hda_pin_sense(struct hda_codec *codec, hda_nid_t nid)
>  {
>  	struct hda_jack_tbl *jack = snd_hda_jack_tbl_get(codec, nid);
>  	if (jack) {
> -		jack_detect_update(codec, jack);
> +		if (jack->update_func)
> +			jack->update_func(codec, jack);

IMO, it's easier to modify jack_detect_update().
Instead of adding update_func pointer, add a new flag phantom_jack
(can be a bit field), then in jack_detect_update():

static void jack_detect_update(struct hda_codec *codec,
			       struct hda_jack_tbl *jack)
{
	if (jack->phantom_jack) {
		jack->pin_sense = AC_PINSENSE_PRESENCE;
		jack->jack_dirty = 0;
	} else ...
}


thanks,

Takashi

Re: [PATCH] ALSA: HDA: Create phantom jacks for fixed inputs and outputs

[David Henningsson]

[-- Attachment #1: Type: text/plain, Size: 2527 bytes --]

On 06/08/2012 10:52 AM, Takashi Iwai wrote:
> At Thu,  7 Jun 2012 15:52:08 +0200,
> David Henningsson wrote:
>>
>> PulseAudio sometimes have difficulties knowing that there is a
>> "Speaker" or "Internal Mic", if they have no individual volume
>> controls or selectors. As a result, only e g "Headphone" might
>> be created for a laptop, but no "Speaker".
>> To help out, create phantom jacks (that are always present,
>> at least for now) for "Speaker", "Internal Mic" etc, in case we
>> detect them.
>> The naming convention is e g "Speaker Phantom Jack".
>>
>> In order not to pollute the /dev/input namespace with even more
>> devices, these are added to the kcontrols only, not the input devices.
>>
>> An implementation note:
>> The possibility to override how to actually do jack sensing opens
>> up for more advanced usage of the jack infrastructure in the future
>> (e g letting the headphone jack detection set presence status for
>> both headphone and mic in case of a headset jack, among other things).
>>
>> Signed-off-by: David Henningsson<david.henningsson@canonical.com>
>> ---
>>   sound/pci/hda/hda_jack.c |   64 ++++++++++++++++++++++++++++++++++------------
>>   sound/pci/hda/hda_jack.h |    5 ++++
>>   2 files changed, 52 insertions(+), 17 deletions(-)
>>
>> diff --git a/sound/pci/hda/hda_jack.c b/sound/pci/hda/hda_jack.c
>> index 2dd1c11..c5569f1 100644
>> --- a/sound/pci/hda/hda_jack.c
>> +++ b/sound/pci/hda/hda_jack.c
>> @@ -133,6 +133,13 @@ static void jack_detect_update(struct hda_codec *codec,
>>   	}
>>   }
>>
>> +static void jack_detect_always_present(struct hda_codec *codec,
>> +				       struct hda_jack_tbl *jack)
>> +{
>> +	jack->pin_sense = AC_PINSENSE_PRESENCE;
>> +	jack->jack_dirty = 0;
>> +}
>> +
>>   /**
>>    * snd_hda_set_dirty_all - Mark all the cached as dirty
>>    *
>> @@ -162,7 +169,8 @@ u32 snd_hda_pin_sense(struct hda_codec *codec, hda_nid_t nid)
>>   {
>>   	struct hda_jack_tbl *jack = snd_hda_jack_tbl_get(codec, nid);
>>   	if (jack) {
>> -		jack_detect_update(codec, jack);
>> +		if (jack->update_func)
>> +			jack->update_func(codec, jack);
>
> IMO, it's easier to modify jack_detect_update().
> Instead of adding update_func pointer, add a new flag phantom_jack
> (can be a bit field), then in jack_detect_update():

The idea was to open up for other types of jack overrides as well, but 
if you prefer to keep it simpler while we can, I'm okay with that.

I'm attaching the modified patch.

-- 
David Henningsson, Canonical Ltd.
https://launchpad.net/~diwic

[-- Attachment #2: 0001-ALSA-HDA-Create-phantom-jacks-for-fixed-inputs-and-o.patch --]
[-- Type: text/x-patch, Size: 5117 bytes --]

>From da45741a45fafc4b4d3767948d269be06cf36851 Mon Sep 17 00:00:00 2001
From: David Henningsson <david.henningsson@canonical.com>
Date: Mon, 4 Jun 2012 09:33:51 +0200
Subject: [PATCH] ALSA: HDA: Create phantom jacks for fixed inputs and outputs

PulseAudio sometimes have difficulties knowing that there is a
"Speaker" or "Internal Mic", if they have no individual volume
controls or selectors. As a result, only e g "Headphone" might
be created for a laptop, but no "Speaker".
To help out, create phantom jacks (that are always present,
at least for now) for "Speaker", "Internal Mic" etc, in case we
detect them.
The naming convention is e g "Speaker Phantom Jack".

In order not to pollute the /dev/input namespace with even more
devices, these are added to the kcontrols only, not the input devices.

Signed-off-by: David Henningsson <david.henningsson@canonical.com>
---
 sound/pci/hda/hda_jack.c |   59 ++++++++++++++++++++++++++++++++--------------
 sound/pci/hda/hda_jack.h |    1 +
 2 files changed, 42 insertions(+), 18 deletions(-)

diff --git a/sound/pci/hda/hda_jack.c b/sound/pci/hda/hda_jack.c
index 2dd1c11..60c976f 100644
--- a/sound/pci/hda/hda_jack.c
+++ b/sound/pci/hda/hda_jack.c
@@ -127,10 +127,15 @@ void snd_hda_jack_tbl_clear(struct hda_codec *codec)
 static void jack_detect_update(struct hda_codec *codec,
 			       struct hda_jack_tbl *jack)
 {
-	if (jack->jack_dirty || !jack->jack_detect) {
+	if (!jack->jack_dirty)
+		return;
+
+	if (jack->phantom_jack)
+		jack->pin_sense = AC_PINSENSE_PRESENCE;
+	else
 		jack->pin_sense = read_pin_sense(codec, jack->nid);
-		jack->jack_dirty = 0;
-	}
+
+	jack->jack_dirty = 0;
 }
 
 /**
@@ -264,8 +269,8 @@ static void hda_free_jack_priv(struct snd_jack *jack)
  * This assigns a jack-detection kctl to the given pin.  The kcontrol
  * will have the given name and index.
  */
-int snd_hda_jack_add_kctl(struct hda_codec *codec, hda_nid_t nid,
-			  const char *name, int idx)
+static int __snd_hda_jack_add_kctl(struct hda_codec *codec, hda_nid_t nid,
+			  const char *name, int idx, bool phantom_jack)
 {
 	struct hda_jack_tbl *jack;
 	struct snd_kcontrol *kctl;
@@ -283,19 +288,30 @@ int snd_hda_jack_add_kctl(struct hda_codec *codec, hda_nid_t nid,
 	if (err < 0)
 		return err;
 	jack->kctl = kctl;
+	jack->phantom_jack = !!phantom_jack;
+
 	state = snd_hda_jack_detect(codec, nid);
 	snd_kctl_jack_report(codec->bus->card, kctl, state);
 #ifdef CONFIG_SND_HDA_INPUT_JACK
-	jack->type = get_input_jack_type(codec, nid);
-	err = snd_jack_new(codec->bus->card, name, jack->type, &jack->jack);
-	if (err < 0)
-		return err;
-	jack->jack->private_data = jack;
-	jack->jack->private_free = hda_free_jack_priv;
-	snd_jack_report(jack->jack, state ? jack->type : 0);
+	if (!phantom_jack) {
+		jack->type = get_input_jack_type(codec, nid);
+		err = snd_jack_new(codec->bus->card, name, jack->type,
+				   &jack->jack);
+		if (err < 0)
+			return err;
+		jack->jack->private_data = jack;
+		jack->jack->private_free = hda_free_jack_priv;
+		snd_jack_report(jack->jack, state ? jack->type : 0);
+	}
 #endif
 	return 0;
 }
+
+int snd_hda_jack_add_kctl(struct hda_codec *codec, hda_nid_t nid,
+			  const char *name, int idx)
+{
+	return __snd_hda_jack_add_kctl(codec, nid, name, idx, false);
+}
 EXPORT_SYMBOL_HDA(snd_hda_jack_add_kctl);
 
 static int add_jack_kctl(struct hda_codec *codec, hda_nid_t nid,
@@ -305,25 +321,32 @@ static int add_jack_kctl(struct hda_codec *codec, hda_nid_t nid,
 	unsigned int def_conf, conn;
 	char name[44];
 	int idx, err;
+	bool phantom_jack;
 
 	if (!nid)
 		return 0;
-	if (!is_jack_detectable(codec, nid))
-		return 0;
 	def_conf = snd_hda_codec_get_pincfg(codec, nid);
 	conn = get_defcfg_connect(def_conf);
-	if (conn != AC_JACK_PORT_COMPLEX)
+	if (conn == AC_JACK_PORT_NONE)
 		return 0;
+	phantom_jack = (conn != AC_JACK_PORT_COMPLEX) ||
+		       !is_jack_detectable(codec, nid);
 
 	snd_hda_get_pin_label(codec, nid, cfg, name, sizeof(name), &idx);
+	if (phantom_jack)
+		/* Example final name: "Internal Mic Phantom Jack" */
+		strncat(name, " Phantom", sizeof(name) - strlen(name) - 1);
 	if (!strcmp(name, lastname) && idx == *lastidx)
 		idx++;
-	strncpy(lastname, name, 44);
+	strncpy(lastname, name, sizeof(name));
 	*lastidx = idx;
-	err = snd_hda_jack_add_kctl(codec, nid, name, idx);
+	err = __snd_hda_jack_add_kctl(codec, nid, name, idx, phantom_jack);
 	if (err < 0)
 		return err;
-	return snd_hda_jack_detect_enable(codec, nid, 0);
+
+	if (!phantom_jack)
+		return snd_hda_jack_detect_enable(codec, nid, 0);
+	return 0;
 }
 
 /**
diff --git a/sound/pci/hda/hda_jack.h b/sound/pci/hda/hda_jack.h
index 8ae5246..a9803da 100644
--- a/sound/pci/hda/hda_jack.h
+++ b/sound/pci/hda/hda_jack.h
@@ -23,6 +23,7 @@ struct hda_jack_tbl {
 	unsigned int pin_sense;		/* cached pin-sense value */
 	unsigned int jack_detect:1;	/* capable of jack-detection? */
 	unsigned int jack_dirty:1;	/* needs to update? */
+	unsigned int phantom_jack:1;    /* a fixed, always present port? */
 	struct snd_kcontrol *kctl;	/* assigned kctl for jack-detection */
 #ifdef CONFIG_SND_HDA_INPUT_JACK
 	int type;
-- 
1.7.9.5


[-- Attachment #3: Type: text/plain, Size: 0 bytes --]

Re: [PATCH] ALSA: HDA: Create phantom jacks for fixed inputs and outputs

[Takashi Iwai]

At Mon, 11 Jun 2012 13:58:43 +0200,
David Henningsson wrote:
> 
> On 06/08/2012 10:52 AM, Takashi Iwai wrote:
> > At Thu,  7 Jun 2012 15:52:08 +0200,
> > David Henningsson wrote:
> >>
> >> PulseAudio sometimes have difficulties knowing that there is a
> >> "Speaker" or "Internal Mic", if they have no individual volume
> >> controls or selectors. As a result, only e g "Headphone" might
> >> be created for a laptop, but no "Speaker".
> >> To help out, create phantom jacks (that are always present,
> >> at least for now) for "Speaker", "Internal Mic" etc, in case we
> >> detect them.
> >> The naming convention is e g "Speaker Phantom Jack".
> >>
> >> In order not to pollute the /dev/input namespace with even more
> >> devices, these are added to the kcontrols only, not the input devices.
> >>
> >> An implementation note:
> >> The possibility to override how to actually do jack sensing opens
> >> up for more advanced usage of the jack infrastructure in the future
> >> (e g letting the headphone jack detection set presence status for
> >> both headphone and mic in case of a headset jack, among other things).
> >>
> >> Signed-off-by: David Henningsson<david.henningsson@canonical.com>
> >> ---
> >>   sound/pci/hda/hda_jack.c |   64 ++++++++++++++++++++++++++++++++++------------
> >>   sound/pci/hda/hda_jack.h |    5 ++++
> >>   2 files changed, 52 insertions(+), 17 deletions(-)
> >>
> >> diff --git a/sound/pci/hda/hda_jack.c b/sound/pci/hda/hda_jack.c
> >> index 2dd1c11..c5569f1 100644
> >> --- a/sound/pci/hda/hda_jack.c
> >> +++ b/sound/pci/hda/hda_jack.c
> >> @@ -133,6 +133,13 @@ static void jack_detect_update(struct hda_codec *codec,
> >>   	}
> >>   }
> >>
> >> +static void jack_detect_always_present(struct hda_codec *codec,
> >> +				       struct hda_jack_tbl *jack)
> >> +{
> >> +	jack->pin_sense = AC_PINSENSE_PRESENCE;
> >> +	jack->jack_dirty = 0;
> >> +}
> >> +
> >>   /**
> >>    * snd_hda_set_dirty_all - Mark all the cached as dirty
> >>    *
> >> @@ -162,7 +169,8 @@ u32 snd_hda_pin_sense(struct hda_codec *codec, hda_nid_t nid)
> >>   {
> >>   	struct hda_jack_tbl *jack = snd_hda_jack_tbl_get(codec, nid);
> >>   	if (jack) {
> >> -		jack_detect_update(codec, jack);
> >> +		if (jack->update_func)
> >> +			jack->update_func(codec, jack);
> >
> > IMO, it's easier to modify jack_detect_update().
> > Instead of adding update_func pointer, add a new flag phantom_jack
> > (can be a bit field), then in jack_detect_update():
> 
> The idea was to open up for other types of jack overrides as well, but 
> if you prefer to keep it simpler while we can, I'm okay with that.
> 
> I'm attaching the modified patch.

Thanks, this looks better to me.
Is it OK to merge this to 3.6 tree?



Takashi

> 
> -- 
> David Henningsson, Canonical Ltd.
> https://launchpad.net/~diwic
> [2 0001-ALSA-HDA-Create-phantom-jacks-for-fixed-inputs-and-o.patch <text/x-patch (7bit)>]
> >From da45741a45fafc4b4d3767948d269be06cf36851 Mon Sep 17 00:00:00 2001
> From: David Henningsson <david.henningsson@canonical.com>
> Date: Mon, 4 Jun 2012 09:33:51 +0200
> Subject: [PATCH] ALSA: HDA: Create phantom jacks for fixed inputs and outputs
> 
> PulseAudio sometimes have difficulties knowing that there is a
> "Speaker" or "Internal Mic", if they have no individual volume
> controls or selectors. As a result, only e g "Headphone" might
> be created for a laptop, but no "Speaker".
> To help out, create phantom jacks (that are always present,
> at least for now) for "Speaker", "Internal Mic" etc, in case we
> detect them.
> The naming convention is e g "Speaker Phantom Jack".
> 
> In order not to pollute the /dev/input namespace with even more
> devices, these are added to the kcontrols only, not the input devices.
> 
> Signed-off-by: David Henningsson <david.henningsson@canonical.com>
> ---
>  sound/pci/hda/hda_jack.c |   59 ++++++++++++++++++++++++++++++++--------------
>  sound/pci/hda/hda_jack.h |    1 +
>  2 files changed, 42 insertions(+), 18 deletions(-)
> 
> diff --git a/sound/pci/hda/hda_jack.c b/sound/pci/hda/hda_jack.c
> index 2dd1c11..60c976f 100644
> --- a/sound/pci/hda/hda_jack.c
> +++ b/sound/pci/hda/hda_jack.c
> @@ -127,10 +127,15 @@ void snd_hda_jack_tbl_clear(struct hda_codec *codec)
>  static void jack_detect_update(struct hda_codec *codec,
>  			       struct hda_jack_tbl *jack)
>  {
> -	if (jack->jack_dirty || !jack->jack_detect) {
> +	if (!jack->jack_dirty)
> +		return;
> +
> +	if (jack->phantom_jack)
> +		jack->pin_sense = AC_PINSENSE_PRESENCE;
> +	else
>  		jack->pin_sense = read_pin_sense(codec, jack->nid);
> -		jack->jack_dirty = 0;
> -	}
> +
> +	jack->jack_dirty = 0;
>  }
>  
>  /**
> @@ -264,8 +269,8 @@ static void hda_free_jack_priv(struct snd_jack *jack)
>   * This assigns a jack-detection kctl to the given pin.  The kcontrol
>   * will have the given name and index.
>   */
> -int snd_hda_jack_add_kctl(struct hda_codec *codec, hda_nid_t nid,
> -			  const char *name, int idx)
> +static int __snd_hda_jack_add_kctl(struct hda_codec *codec, hda_nid_t nid,
> +			  const char *name, int idx, bool phantom_jack)
>  {
>  	struct hda_jack_tbl *jack;
>  	struct snd_kcontrol *kctl;
> @@ -283,19 +288,30 @@ int snd_hda_jack_add_kctl(struct hda_codec *codec, hda_nid_t nid,
>  	if (err < 0)
>  		return err;
>  	jack->kctl = kctl;
> +	jack->phantom_jack = !!phantom_jack;
> +
>  	state = snd_hda_jack_detect(codec, nid);
>  	snd_kctl_jack_report(codec->bus->card, kctl, state);
>  #ifdef CONFIG_SND_HDA_INPUT_JACK
> -	jack->type = get_input_jack_type(codec, nid);
> -	err = snd_jack_new(codec->bus->card, name, jack->type, &jack->jack);
> -	if (err < 0)
> -		return err;
> -	jack->jack->private_data = jack;
> -	jack->jack->private_free = hda_free_jack_priv;
> -	snd_jack_report(jack->jack, state ? jack->type : 0);
> +	if (!phantom_jack) {
> +		jack->type = get_input_jack_type(codec, nid);
> +		err = snd_jack_new(codec->bus->card, name, jack->type,
> +				   &jack->jack);
> +		if (err < 0)
> +			return err;
> +		jack->jack->private_data = jack;
> +		jack->jack->private_free = hda_free_jack_priv;
> +		snd_jack_report(jack->jack, state ? jack->type : 0);
> +	}
>  #endif
>  	return 0;
>  }
> +
> +int snd_hda_jack_add_kctl(struct hda_codec *codec, hda_nid_t nid,
> +			  const char *name, int idx)
> +{
> +	return __snd_hda_jack_add_kctl(codec, nid, name, idx, false);
> +}
>  EXPORT_SYMBOL_HDA(snd_hda_jack_add_kctl);
>  
>  static int add_jack_kctl(struct hda_codec *codec, hda_nid_t nid,
> @@ -305,25 +321,32 @@ static int add_jack_kctl(struct hda_codec *codec, hda_nid_t nid,
>  	unsigned int def_conf, conn;
>  	char name[44];
>  	int idx, err;
> +	bool phantom_jack;
>  
>  	if (!nid)
>  		return 0;
> -	if (!is_jack_detectable(codec, nid))
> -		return 0;
>  	def_conf = snd_hda_codec_get_pincfg(codec, nid);
>  	conn = get_defcfg_connect(def_conf);
> -	if (conn != AC_JACK_PORT_COMPLEX)
> +	if (conn == AC_JACK_PORT_NONE)
>  		return 0;
> +	phantom_jack = (conn != AC_JACK_PORT_COMPLEX) ||
> +		       !is_jack_detectable(codec, nid);
>  
>  	snd_hda_get_pin_label(codec, nid, cfg, name, sizeof(name), &idx);
> +	if (phantom_jack)
> +		/* Example final name: "Internal Mic Phantom Jack" */
> +		strncat(name, " Phantom", sizeof(name) - strlen(name) - 1);
>  	if (!strcmp(name, lastname) && idx == *lastidx)
>  		idx++;
> -	strncpy(lastname, name, 44);
> +	strncpy(lastname, name, sizeof(name));
>  	*lastidx = idx;
> -	err = snd_hda_jack_add_kctl(codec, nid, name, idx);
> +	err = __snd_hda_jack_add_kctl(codec, nid, name, idx, phantom_jack);
>  	if (err < 0)
>  		return err;
> -	return snd_hda_jack_detect_enable(codec, nid, 0);
> +
> +	if (!phantom_jack)
> +		return snd_hda_jack_detect_enable(codec, nid, 0);
> +	return 0;
>  }
>  
>  /**
> diff --git a/sound/pci/hda/hda_jack.h b/sound/pci/hda/hda_jack.h
> index 8ae5246..a9803da 100644
> --- a/sound/pci/hda/hda_jack.h
> +++ b/sound/pci/hda/hda_jack.h
> @@ -23,6 +23,7 @@ struct hda_jack_tbl {
>  	unsigned int pin_sense;		/* cached pin-sense value */
>  	unsigned int jack_detect:1;	/* capable of jack-detection? */
>  	unsigned int jack_dirty:1;	/* needs to update? */
> +	unsigned int phantom_jack:1;    /* a fixed, always present port? */
>  	struct snd_kcontrol *kctl;	/* assigned kctl for jack-detection */
>  #ifdef CONFIG_SND_HDA_INPUT_JACK
>  	int type;
> -- 
> 1.7.9.5
> 

Re: [PATCH] ALSA: HDA: Create phantom jacks for fixed inputs and outputs

[David Henningsson]

2012-06-12 18:19, Takashi Iwai skrev:
> At Mon, 11 Jun 2012 13:58:43 +0200,
> David Henningsson wrote:
>> On 06/08/2012 10:52 AM, Takashi Iwai wrote:
>>> At Thu,  7 Jun 2012 15:52:08 +0200,
>>> David Henningsson wrote:
>>>> PulseAudio sometimes have difficulties knowing that there is a
>>>> "Speaker" or "Internal Mic", if they have no individual volume
>>>> controls or selectors. As a result, only e g "Headphone" might
>>>> be created for a laptop, but no "Speaker".
>>>> To help out, create phantom jacks (that are always present,
>>>> at least for now) for "Speaker", "Internal Mic" etc, in case we
>>>> detect them.
>>>> The naming convention is e g "Speaker Phantom Jack".
>>>>
>>>> In order not to pollute the /dev/input namespace with even more
>>>> devices, these are added to the kcontrols only, not the input devices.
>>>>
>>>> An implementation note:
>>>> The possibility to override how to actually do jack sensing opens
>>>> up for more advanced usage of the jack infrastructure in the future
>>>> (e g letting the headphone jack detection set presence status for
>>>> both headphone and mic in case of a headset jack, among other things).
>>>>
>>>> Signed-off-by: David Henningsson<david.henningsson@canonical.com>
>>>> ---
>>>>    sound/pci/hda/hda_jack.c |   64 ++++++++++++++++++++++++++++++++++------------
>>>>    sound/pci/hda/hda_jack.h |    5 ++++
>>>>    2 files changed, 52 insertions(+), 17 deletions(-)
>>>>
>>>> diff --git a/sound/pci/hda/hda_jack.c b/sound/pci/hda/hda_jack.c
>>>> index 2dd1c11..c5569f1 100644
>>>> --- a/sound/pci/hda/hda_jack.c
>>>> +++ b/sound/pci/hda/hda_jack.c
>>>> @@ -133,6 +133,13 @@ static void jack_detect_update(struct hda_codec *codec,
>>>>    	}
>>>>    }
>>>>
>>>> +static void jack_detect_always_present(struct hda_codec *codec,
>>>> +				       struct hda_jack_tbl *jack)
>>>> +{
>>>> +	jack->pin_sense = AC_PINSENSE_PRESENCE;
>>>> +	jack->jack_dirty = 0;
>>>> +}
>>>> +
>>>>    /**
>>>>     * snd_hda_set_dirty_all - Mark all the cached as dirty
>>>>     *
>>>> @@ -162,7 +169,8 @@ u32 snd_hda_pin_sense(struct hda_codec *codec, hda_nid_t nid)
>>>>    {
>>>>    	struct hda_jack_tbl *jack = snd_hda_jack_tbl_get(codec, nid);
>>>>    	if (jack) {
>>>> -		jack_detect_update(codec, jack);
>>>> +		if (jack->update_func)
>>>> +			jack->update_func(codec, jack);
>>> IMO, it's easier to modify jack_detect_update().
>>> Instead of adding update_func pointer, add a new flag phantom_jack
>>> (can be a bit field), then in jack_detect_update():
>> The idea was to open up for other types of jack overrides as well, but
>> if you prefer to keep it simpler while we can, I'm okay with that.
>>
>> I'm attaching the modified patch.
> Thanks, this looks better to me.
> Is it OK to merge this to 3.6 tree?

Hmm, good question. I guess the answer is, it would be nice to have in 
3.5 but not strictly necessary.

With the Ubuntu hat on, the autumn version of Ubuntu is more likely to 
use 3.5 (but maybe 3.6, it has not yet been decided), and I'm going to 
need this fix in there, but if necessary I can backport it into the 
Ubuntu kernel.

With the PulseAudio hat on, as it helps us resolve a problem that hits 
quite a few machines, it would be good to have it ASAP, but OTOH, since 
we're currently discussing the PulseAudio release schedule, it's 
difficult to tell whether we will actually have a PulseAudio version out 
that uses these new phantom jacks anyway before Linux 3.6 is released.

(and with the kernel hat on, I have to admit it isn't strictly a 
regression fix, and that the merge window is over...)

-- 
David Henningsson, Canonical Ltd.
https://launchpad.net/~diwic

Re: [PATCH] ALSA: HDA: Create phantom jacks for fixed inputs and outputs

[Takashi Iwai]

At Wed, 13 Jun 2012 11:52:46 +0200,
David Henningsson wrote:
> 
> 2012-06-12 18:19, Takashi Iwai skrev:
> > At Mon, 11 Jun 2012 13:58:43 +0200,
> > David Henningsson wrote:
> >> On 06/08/2012 10:52 AM, Takashi Iwai wrote:
> >>> At Thu,  7 Jun 2012 15:52:08 +0200,
> >>> David Henningsson wrote:
> >>>> PulseAudio sometimes have difficulties knowing that there is a
> >>>> "Speaker" or "Internal Mic", if they have no individual volume
> >>>> controls or selectors. As a result, only e g "Headphone" might
> >>>> be created for a laptop, but no "Speaker".
> >>>> To help out, create phantom jacks (that are always present,
> >>>> at least for now) for "Speaker", "Internal Mic" etc, in case we
> >>>> detect them.
> >>>> The naming convention is e g "Speaker Phantom Jack".
> >>>>
> >>>> In order not to pollute the /dev/input namespace with even more
> >>>> devices, these are added to the kcontrols only, not the input devices.
> >>>>
> >>>> An implementation note:
> >>>> The possibility to override how to actually do jack sensing opens
> >>>> up for more advanced usage of the jack infrastructure in the future
> >>>> (e g letting the headphone jack detection set presence status for
> >>>> both headphone and mic in case of a headset jack, among other things).
> >>>>
> >>>> Signed-off-by: David Henningsson<david.henningsson@canonical.com>
> >>>> ---
> >>>>    sound/pci/hda/hda_jack.c |   64 ++++++++++++++++++++++++++++++++++------------
> >>>>    sound/pci/hda/hda_jack.h |    5 ++++
> >>>>    2 files changed, 52 insertions(+), 17 deletions(-)
> >>>>
> >>>> diff --git a/sound/pci/hda/hda_jack.c b/sound/pci/hda/hda_jack.c
> >>>> index 2dd1c11..c5569f1 100644
> >>>> --- a/sound/pci/hda/hda_jack.c
> >>>> +++ b/sound/pci/hda/hda_jack.c
> >>>> @@ -133,6 +133,13 @@ static void jack_detect_update(struct hda_codec *codec,
> >>>>    	}
> >>>>    }
> >>>>
> >>>> +static void jack_detect_always_present(struct hda_codec *codec,
> >>>> +				       struct hda_jack_tbl *jack)
> >>>> +{
> >>>> +	jack->pin_sense = AC_PINSENSE_PRESENCE;
> >>>> +	jack->jack_dirty = 0;
> >>>> +}
> >>>> +
> >>>>    /**
> >>>>     * snd_hda_set_dirty_all - Mark all the cached as dirty
> >>>>     *
> >>>> @@ -162,7 +169,8 @@ u32 snd_hda_pin_sense(struct hda_codec *codec, hda_nid_t nid)
> >>>>    {
> >>>>    	struct hda_jack_tbl *jack = snd_hda_jack_tbl_get(codec, nid);
> >>>>    	if (jack) {
> >>>> -		jack_detect_update(codec, jack);
> >>>> +		if (jack->update_func)
> >>>> +			jack->update_func(codec, jack);
> >>> IMO, it's easier to modify jack_detect_update().
> >>> Instead of adding update_func pointer, add a new flag phantom_jack
> >>> (can be a bit field), then in jack_detect_update():
> >> The idea was to open up for other types of jack overrides as well, but
> >> if you prefer to keep it simpler while we can, I'm okay with that.
> >>
> >> I'm attaching the modified patch.
> > Thanks, this looks better to me.
> > Is it OK to merge this to 3.6 tree?
> 
> Hmm, good question. I guess the answer is, it would be nice to have in 
> 3.5 but not strictly necessary.
> 
> With the Ubuntu hat on, the autumn version of Ubuntu is more likely to 
> use 3.5 (but maybe 3.6, it has not yet been decided), and I'm going to 
> need this fix in there, but if necessary I can backport it into the 
> Ubuntu kernel.
> 
> With the PulseAudio hat on, as it helps us resolve a problem that hits 
> quite a few machines, it would be good to have it ASAP, but OTOH, since 
> we're currently discussing the PulseAudio release schedule, it's 
> difficult to tell whether we will actually have a PulseAudio version out 
> that uses these new phantom jacks anyway before Linux 3.6 is released.
> 
> (and with the kernel hat on, I have to admit it isn't strictly a 
> regression fix, and that the merge window is over...)

OK, I'm wearing the kernel hat on ;)
Applied to topic/hda branch now.


thanks,

Takashi