ALSA: hda - hdmi jack support for dynamic pcm assignment
Subsystems (2)
v2 cover ALSA: hda - hdmi jack support for dynamic pcm assignment
From: Libin Yang <[email protected]>
The patchset adds hdmi jack support for dynamic pcm assignment
Libin Yang (3):
ALSA: Add documentation about HD-audio DP MST
ALSA: hda - add hdmi_pcm to manage hdmi pcm related features
ALSA: hda - hdmi jack created based on pcm
Documentation/sound/alsa/HD-Audio-DP-MST-audio.txt | 74 ++++++++++++ sound/pci/hda/patch_hdmi.c | 132 ++++++++++++++------- 2 files changed, 164 insertions(+), 42 deletions(-) create mode 100644 Documentation/sound/alsa/HD-Audio-DP-MST-audio.txt
Signature · 1 line
1.9.1
PATCH v2 1/3 ALSA: Add documentation about HD-audio DP MST
From: Libin Yang <[email protected]>
Add the documentation about HD-audio DP MST:
1. Overview
2. Jack
Others will be added later.
--- Documentation/sound/alsa/HD-Audio-DP-MST-audio.txt | 74 ++++++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 Documentation/sound/alsa/HD-Audio-DP-MST-audio.txt
Documentation/sound/alsa/HD-Audio-DP-MST-audio.txt new file +74 -0
@@ -0,0 +1,74 @@ +To support DP MST audio, HD Audio hdmi codec driver introduces virtual pin +and dynamic pcm assignment. + +Virtual pin is an extension of per_pin. The most difference of DP MST +from legacy is that DP MST introduces device entry. Each pin can contain +several device entries. Each device entry behaves as a pin. + +As each pin may contain several device entries and each codec may contain +several pins, if we use one pcm per per_pin, there will be many PCMs. +The new solution is to create a few PCMs and to dynamically bind pcm to +per_pin. Driver uses spec->dyn_pcm_assign flag to indicate whether to use +the new solution. + +PCM +=== +To be added + + +Jack +==== + +Presume: + - MST must be dyn_pcm_assign, and it is acomp (for Intel scenario); + - NON-MST may or may not be dyn_pcm_assign, it can be acomp or !acomp; + +So there are the following scenarios: + a. MST (&& dyn_pcm_assign && acomp) + b. NON-MST && dyn_pcm_assign && acomp + c. NON-MST && !dyn_pcm_assign && !acomp + +Below discussion will ignore MST and NON-MST difference as it doesn't +impact on jack handling too much. + +Driver uses struct hdmi_pcm pcm[] array in hdmi_spec and snd_jack is +a member of hdmi_pcm. Each pin has one struct hdmi_pcm * pcm pointer. + +For !dyn_pcm_assign, per_pin->pcm will assigned to spec->pcm[n] statically. + +For dyn_pcm_assign, per_pin->pcm will assigned to spec->pcm[n] +when monitor is hotplugged. + + +Build Jack +---------- + +- dyn_pcm_assign +Will not use hda_jack but use snd_jack in spec->pcm_rec[pcm_idx].jack directly. + +- !dyn_pcm_assign +Use hda_jack and assign spec->pcm_rec[pcm_idx].jack = jack->jack statically. + + +Unsolicited Event Enabling +-------------------------- +Enable unsolicited event if !acomp. + + +Monitor Hotplug Event Handling +------------------------------ +- acomp +pin_eld_notify() -> check_presence_and_report() -> hdmi_present_sense() -> +sync_eld_via_acomp(). +Use directly snd_jack_report() on spec->pcm_rec[pcm_idx].jack for +both dyn_pcm_assign and !dyn_pcm_assign + +- !acomp +Hdmi_unsol_event() -> hdmi_intrinsic_event() -> check_presence_and_report() -> +hdmi_present_sense() -> hdmi_prepsent_sense_via_verbs() +Use directly snd_jack_report() on spec->pcm_rec[pcm_idx].jack for dyn_pcm_assign. +Use hda_jack mechanism to handle jack events. + + +Others to be added later +========================
Signature · 1 line
1.9.1
PATCH v2 2/3 ALSA: hda - add hdmi_pcm to manage hdmi pcm related features
In reply to [email protected]From: Libin Yang <[email protected]>
Use struct hdmi_pcm wrapper for hdmi pcm management.
All PCM related features, like jack, will be put in this structure.
--- sound/pci/hda/patch_hdmi.c | 39 +++++++++++++++++++++++---------------- 1 file changed, 23 insertions(+), 16 deletions(-)
sound/pci/hda/patch_hdmi.c +23 -16
@@ -86,7 +86,7 @@ struct hdmi_spec_per_pin {struct delayed_work work;struct snd_kcontrol *eld_ctl;struct snd_jack *acomp_jack;/* jack via audio component */ -struct hda_pcm *pcm;/* pointer to spec->pcm_rec[n] dynamically*/ +struct hdmi_pcm *pcm;/* pointer to spec->pcm_rec[n] dynamically*/ int pcm_idx;/* which pcm is attached. -1 means no pcm is attached */ int repoll_count;bool setup;/* the stream has been set up by prepare callback */
@@ -132,6 +132,11 @@ struct hdmi_ops {int (*chmap_validate)(int ca,int channels,unsigned char *chmap); }; +struct hdmi_pcm { +struct hda_pcm *pcm; +struct snd_jack *jack; +}; +struct hdmi_spec {int num_cvts;struct snd_array cvts;/* struct hdmi_spec_per_cvt */
@@ -139,7 +144,7 @@ struct hdmi_spec {int num_pins;struct snd_array pins;/* struct hdmi_spec_per_pin */ -struct hda_pcm *pcm_rec[16 ]; +struct hdmi_pcm pcm_rec[16 ];struct mutex pcm_lock;/* pcm_bitmap means which pcms have been assigned to pins*/ unsigned long pcm_bitmap;
@@ -381,7 +386,10 @@ static struct cea_channel_speaker_allocation channel_allocations[] = { ((struct hdmi_spec_per_pin *)snd_array_elem(&spec->pins, idx))#define get_cvt (spec, idx) \ ((struct hdmi_spec_per_cvt *)snd_array_elem(&spec->cvts, idx)) -#define get_pcm_rec (spec, idx) ((spec)->pcm_rec[idx]) +/* obtain hdmi_pcm object assigned to idx */ +#define get_hdmi_pcm (spec, idx) (&(spec)->pcm_rec[idx]) +/* obtain hda_pcm object assigned to idx */ +#define get_pcm_rec (spec, idx) (get_hdmi_pcm(spec, idx)->pcm)static int pin_nid_to_pin_index (struct hda_codec *codec,hda_nid_t pin_nid) {
@@ -419,7 +427,8 @@ static int hinfo_to_pin_index(struct hda_codec *codec,for (pin_idx =0 ; pin_idx < spec->num_pins; pin_idx++) { per_pin =get_pin (spec, pin_idx); -if (per_pin->pcm && per_pin->pcm->stream == hinfo) +if (per_pin->pcm && + per_pin->pcm->pcm->stream == hinfo)return pin_idx; }
@@ -1721,7 +1730,7 @@ static void hdmi_attach_hda_pcm(struct hdmi_spec *spec,if (idx == -ENODEV )return ; per_pin->pcm_idx = idx; - per_pin->pcm = spec->pcm_rec[idx]; + per_pin->pcm =get_hdmi_pcm (spec, idx);set_bit (idx, &spec->pcm_bitmap); }
@@ -1764,7 +1773,7 @@ static void hdmi_pcm_setup_pin(struct hdmi_spec *spec,bool non_pcm;if (per_pin->pcm_idx >=0 && per_pin->pcm_idx < spec->pcm_used) - pcm = spec->pcm_rec[per_pin->pcm_idx]; + pcm =get_pcm_rec (spec, per_pin->pcm_idx);else return ;if (!test_bit (per_pin->pcm_idx, &spec->pcm_in_use))
@@ -2028,8 +2037,10 @@ static int hdmi_add_pin(struct hda_codec *codec, hda_nid_t pin_nid) per_pin->non_pcm = false;if (spec->dyn_pcm_assign) per_pin->pcm_idx =-1 ; -else +else { + per_pin->pcm =get_hdmi_pcm (spec, pin_idx); per_pin->pcm_idx = pin_idx; + } per_pin->pin_nid_idx = pin_idx; err =hdmi_read_pin_conn (codec, pin_idx);
@@ -2439,7 +2450,6 @@ static int hdmi_chmap_ctl_put(struct snd_kcontrol *kcontrol,static int generic_hdmi_build_pcms (struct hda_codec *codec) {struct hdmi_spec *spec = codec->spec; -struct hdmi_spec_per_pin *per_pin;int pin_idx;for (pin_idx =0 ; pin_idx < spec->num_pins; pin_idx++) {
@@ -2449,11 +2459,8 @@ static int generic_hdmi_build_pcms(struct hda_codec *codec) info =snd_hda_codec_pcm_new (codec,"HDMI %d" , pin_idx);if (!info)return -ENOMEM ; -if (!spec->dyn_pcm_assign) { - per_pin =get_pin (spec, pin_idx); - per_pin->pcm = info; - } - spec->pcm_rec[pin_idx] = info; + + spec->pcm_rec[pin_idx].pcm = info; spec->pcm_used++; info->pcm_type =HDA_PCM_TYPE_HDMI ; info->own_chmap = true;
@@ -2536,7 +2543,7 @@ static int generic_hdmi_build_controls(struct hda_codec *codec)/* add control for ELD Bytes */ err =hdmi_create_eld_ctl (codec, pin_idx, -get_pcm_rec (spec, pin_idx)->device); +get_pcm_rec (spec, pin_idx)->device);if (err <0 )return err;
@@ -2551,7 +2558,7 @@ static int generic_hdmi_build_controls(struct hda_codec *codec)struct snd_kcontrol *kctl;int i; - pcm = spec->pcm_rec[pin_idx]; + pcm =get_pcm_rec (spec, pin_idx);if (!pcm || !pcm->pcm)break ; err = snd_pcm_add_chmap_ctls(pcm->pcm,
@@ -2857,7 +2864,7 @@ static int simple_playback_build_pcms(struct hda_codec *codec) info =snd_hda_codec_pcm_new (codec,"HDMI 0" );if (!info)return -ENOMEM ; - spec->pcm_rec[0 ] = info; + spec->pcm_rec[0 ].pcm = info; info->pcm_type =HDA_PCM_TYPE_HDMI ; pstr = &info->stream[SNDRV_PCM_STREAM_PLAYBACK ]; *pstr = spec->pcm_playback;
Signature · 1 line
1.9.1
PATCH v2 3/3 ALSA: hda - hdmi jack created based on pcm
In reply to [email protected]From: Libin Yang <[email protected]>
Jack is created based on pcm.
Apply the acomp jack rule to dyn_pcm_assign.
For dyn_pcm_assign:
Driver does not use hda_jack. It operates snd_jack directly. snd_jack pointer will be stored in spec->pcm.jack instead of the current spec->acomp_jack. When pcm is assigned to pin, jack will be assigned to pin automatically.
For !dyn_pcm_assign:
Driver continues using hda_jack for less impact on the old cases. Pcm is statically assigned to pin. So is jack. spec->pcm.jack saves the snd_jack pointer created in hda_jack.
--- sound/pci/hda/patch_hdmi.c | 93 +++++++++++++++++++++++++++++++++------------- 1 file changed, 67 insertions(+), 26 deletions(-)
sound/pci/hda/patch_hdmi.c +67 -26
@@ -85,7 +85,6 @@ struct hdmi_spec_per_pin {struct mutex lock;struct delayed_work work;struct snd_kcontrol *eld_ctl; -struct snd_jack *acomp_jack;/* jack via audio component */ struct hdmi_pcm *pcm;/* pointer to spec->pcm_rec[n] dynamically*/ int pcm_idx;/* which pcm is attached. -1 means no pcm is attached */ int repoll_count;
@@ -1946,6 +1945,7 @@ static void sync_eld_via_acomp(struct hda_codec *codec, {struct hdmi_spec *spec = codec->spec;struct hdmi_eld *eld = &spec->temp_eld; +struct snd_jack *jack =NULL ;int size;mutex_lock (&per_pin->lock);
@@ -1969,8 +1969,17 @@ static void sync_eld_via_acomp(struct hda_codec *codec, eld->eld_size =0 ; } +/* pcm_idx >=0 before update_eld() means it is in monitor +* disconnected event. Jack must be fetched before update_eld() +*/ +if (per_pin->pcm_idx >=0 ) + jack = spec->pcm_rec[per_pin->pcm_idx].jack;update_eld (codec, per_pin, eld); -snd_jack_report (per_pin->acomp_jack, +if (jack ==NULL && per_pin->pcm_idx >=0 ) + jack = spec->pcm_rec[per_pin->pcm_idx].jack; +if (jack ==NULL ) + goto unlock; +snd_jack_report (jack, eld->monitor_present ?SND_JACK_AVOUT :0 ); unlock:mutex_unlock (&per_pin->lock);
@@ -2474,15 +2483,16 @@ static int generic_hdmi_build_pcms(struct hda_codec *codec)return 0 ; } -static void free_acomp_jack_priv (struct snd_jack *jack) +static void free_hdmi_jack_priv (struct snd_jack *jack) { -struct hdmi_spec_per_pin *per_pin = jack->private_data; +struct hdmi_pcm *pcm = jack->private_data; - per_pin->acomp_jack =NULL ; + pcm->jack =NULL ; } -static int add_acomp_jack_kctl (struct hda_codec *codec, -struct hdmi_spec_per_pin *per_pin, +static int add_hdmi_jack_kctl (struct hda_codec *codec, +struct hdmi_spec *spec, +int pcm_idx,const char *name) {struct snd_jack *jack;
@@ -2492,45 +2502,68 @@ static int add_acomp_jack_kctl(struct hda_codec *codec, true, false);if (err <0 )return err; - per_pin->acomp_jack = jack; - jack->private_data = per_pin; - jack->private_free = free_acomp_jack_priv; + + spec->pcm_rec[pcm_idx].jack = jack; + jack->private_data = &spec->pcm_rec[pcm_idx]; + jack->private_free = free_hdmi_jack_priv;return 0 ; } -static int generic_hdmi_build_jack (struct hda_codec *codec,int pin_idx) +static int generic_hdmi_build_jack (struct hda_codec *codec,int pcm_idx) {char hdmi_str[32 ] ="HDMI/DP" ;struct hdmi_spec *spec = codec->spec; -struct hdmi_spec_per_pin *per_pin =get_pin (spec, pin_idx); -int pcmdev =get_pcm_rec (spec, pin_idx)->device; +struct hdmi_spec_per_pin *per_pin; +struct hda_jack_tbl *jack; +int pcmdev =get_pcm_rec (spec, pcm_idx)->device;bool phantom_jack; +int ret;if (pcmdev >0 )sprintf (hdmi_str +strlen (hdmi_str),",pcm=%d" , pcmdev); -if (codec_has_acomp (codec)) -return add_acomp_jack_kctl (codec, per_pin, hdmi_str); + +if (spec->dyn_pcm_assign) +return add_hdmi_jack_kctl (codec, spec, pcm_idx, hdmi_str); + +/* for !dyn_pcm_assign, we still use hda_jack for compatibility */ +/* if !dyn_pcm_assign, it must be non-MST mode. +* This means pcms and pins are statically mapped. +* And pcm_idx is pin_idx. +*/ + per_pin =get_pin (spec, pcm_idx); phantom_jack = !is_jack_detectable (codec, per_pin->pin_nid);if (phantom_jack)strncat (hdmi_str," Phantom" ,sizeof (hdmi_str) -strlen (hdmi_str) -1 ); - -return snd_hda_jack_add_kctl (codec, per_pin->pin_nid, hdmi_str, - phantom_jack); + ret =snd_hda_jack_add_kctl (codec, per_pin->pin_nid, hdmi_str, + phantom_jack); +if (ret <0 ) +return ret; + jack =snd_hda_jack_tbl_get (codec, per_pin->pin_nid); +if (jack ==NULL ) +return 0 ; +/* assign jack->jack to pcm_rec[].jack to +* align with dyn_pcm_assign mode +*/ + spec->pcm_rec[pcm_idx].jack = jack->jack; +return 0 ; }static int generic_hdmi_build_controls (struct hda_codec *codec) {struct hdmi_spec *spec = codec->spec;int err; -int pin_idx; +int pin_idx, pcm_idx; -for (pin_idx =0 ; pin_idx < spec->num_pins; pin_idx++) { -struct hdmi_spec_per_pin *per_pin =get_pin (spec, pin_idx); - err =generic_hdmi_build_jack (codec, pin_idx); +for (pcm_idx =0 ; pcm_idx < spec->pcm_used; pcm_idx++) { + err =generic_hdmi_build_jack (codec, pcm_idx);if (err <0 )return err; + } + +for (pin_idx =0 ; pin_idx < spec->num_pins; pin_idx++) { +struct hdmi_spec_per_pin *per_pin =get_pin (spec, pin_idx); err = snd_hda_create_dig_out_ctls(codec, per_pin->pin_nid,
@@ -2629,18 +2662,25 @@ static void hdmi_array_free(struct hdmi_spec *spec)static void generic_hdmi_free (struct hda_codec *codec) {struct hdmi_spec *spec = codec->spec; -int pin_idx; +int pin_idx, pcm_idx;if (codec_has_acomp (codec))snd_hdac_i915_register_notifier (NULL );for (pin_idx =0 ; pin_idx < spec->num_pins; pin_idx++) {struct hdmi_spec_per_pin *per_pin =get_pin (spec, pin_idx); -cancel_delayed_work_sync (&per_pin->work);eld_proc_free (per_pin); -if (per_pin->acomp_jack) -snd_device_free (codec->card, per_pin->acomp_jack); + } + +for (pcm_idx =0 ; pcm_idx < spec->pcm_used; pcm_idx++) { +if (spec->pcm_rec[pcm_idx].jack ==NULL ) +continue ; +if (spec->dyn_pcm_assign) +snd_device_free (codec->card, + spec->pcm_rec[pcm_idx].jack); +else + spec->pcm_rec[pcm_idx].jack =NULL ; }if (spec->i915_bound)
@@ -2842,6 +2882,7 @@ static int patch_generic_hdmi(struct hda_codec *codec)init_channel_allocations (); +WARN_ON (spec->dyn_pcm_assign && !codec_has_acomp (codec));return 0 ; }
Signature · 1 line
1.9.1
Quoted 9 lines · On Tue, 12 Jan 2016 04:13:24 +0100, [email protected] wrote:
From: Libin Yang <[email protected]>
The patchset adds hdmi jack support for dynamic pcm assignment
Libin Yang (3):
ALSA: Add documentation about HD-audio DP MST
ALSA: hda - addhdmi_pcmto manage hdmi pcm related features
ALSA: hda - hdmi jack created based on pcm
I merged these three patches to topic/hda-mst branch now. But, since the MST audio support itself is still incomplete in i915 side, I postpone this merge to for-next for 4.5 kernel, at least. Let's get it working for 4.6.
thanks,
Takashi
Hi Takashi,
Quoted 20 lines
-----Original Message-----
From: Takashi Iwai [mailto:[email protected]]
Sent: Tuesday, January 12, 2016 2:21 PM
To: [email protected]
Cc: [email protected]; Lin, Mengdong; Yang, Libin
Subject: Re: [alsa-devel] [PATCH v2 0/3] ALSA: hda - hdmi jack support for dynamic pcm assignmentQuoted 9 lines · On Tue, 12 Jan 2016 04:13:24 +0100, [email protected] wrote:
From: Libin Yang <[email protected]>
The patchset adds hdmi jack support for dynamic pcm assignment
Libin Yang (3):
ALSA: Add documentation about HD-audio DP MST
ALSA: hda - addhdmi_pcmto manage hdmi pcm related features
ALSA: hda - hdmi jack created based on pcm
Quoted 4 lines
I merged these three patches to topic/hda-mst branch now. But, since the MST audio support itself is still incomplete in i915 side, I postpone this merge to for-next for 4.5 kernel, at least. Let's get it working for 4.6.
Get it. Thanks. And I will initialize a discussion with gfx team about how to support DP MST audio later.
Regards,
Libin
Quoted 5 lines
thanks,
Takashi