ALSA: hda - hdmi dynamically bind PCM to pin when monitor hotplug
PATCH v5 1/2 ALSA: hda - hdmi dynamically bind PCM to pin when monitor hotplug
From: Libin Yang <[email protected]>
Dynamically bind/unbind the PCM to pin when HDMI/DP monitor hotplug.
When monitor is connected, find a proper PCM for the monitor. When monitor is disconnected, unbind the PCM from the pin.
The binding policy (use Intel platform as example) is:
1. Try to use the legacy pin-pcm mapping for the device entry 0 of the pin.
2. If step 1 fails, try to bind pin to the backup PCMs. For example, on Intel platform, if DP MST is enabled, 5 PCMs will be created. PCM 3, PCM 7, PCM 8 are supposed to be used by device entry 0 of pin 5, pin 6 and pin 7. PCM 9 and PCM 10 are the backup PCMs.
3. If step 2 fails, try to find any PCM to bind to the pin.
--- sound/pci/hda/patch_hdmi.c | 82 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 80 insertions(+), 2 deletions(-)
sound/pci/hda/patch_hdmi.c +80 -2
@@ -73,6 +73,8 @@ struct hdmi_spec_per_cvt {struct hdmi_spec_per_pin {hda_nid_t pin_nid; +/* pin idx, different device entries on the same pin use the same idx */ +int pin_nid_idx;int num_mux_nids;hda_nid_t mux_nids[HDA_MAX_CONNECTIONS ];int mux_idx;
@@ -85,6 +87,7 @@ struct hdmi_spec_per_pin {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*/ +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 */ int channels;/* current number of channels */
@@ -138,6 +141,8 @@ struct hdmi_spec {struct snd_array pins;/* struct hdmi_spec_per_pin */ struct hda_pcm *pcm_rec[16 ];struct mutex pcm_lock; +/* pcm_bitmap means which pcms have been assigned to pins*/ +unsigned long pcm_bitmap;int pcm_used;/* counter of pcm_rec[] */ unsigned int channels_max;/* max over all cvts */
@@ -1671,6 +1676,60 @@ static int hdmi_read_pin_conn(struct hda_codec *codec, int pin_idx)return 0 ; } +static int hdmi_find_pcm_slot (struct hdmi_spec *spec, +struct hdmi_spec_per_pin *per_pin) +{ +int i; + +/* try the prefer PCM */ +if (!test_bit (per_pin->pin_nid_idx, &spec->pcm_bitmap)) +return per_pin->pin_nid_idx; + +/* have a second try; check the "reserved area" over num_pins */ +for (i = spec->num_pins; i < spec->pcm_used; i++) { +if (!test_bit (i, &spec->pcm_bitmap)) +return i; + } + +/* the last try; check the empty slots in pins */ +for (i =0 ; i < spec->num_pins; i++) { +if (!test_bit (i, &spec->pcm_bitmap)) +return i; + } +return -EBUSY ; +} + +static void hdmi_attach_hda_pcm (struct hdmi_spec *spec, +struct hdmi_spec_per_pin *per_pin) +{ +int idx; + +/* pcm already be attached to the pin */ +if (per_pin->pcm) +return ; + idx =hdmi_find_pcm_slot (spec, per_pin); +if (idx == -ENODEV ) +return ; + per_pin->pcm_idx = idx; + per_pin->pcm = spec->pcm_rec[idx]; +set_bit (idx, &spec->pcm_bitmap); +} + +static void hdmi_detach_hda_pcm (struct hdmi_spec *spec, +struct hdmi_spec_per_pin *per_pin) +{ +int idx; + +/* pcm already be detached from the pin */ +if (!per_pin->pcm) +return ; + idx = per_pin->pcm_idx; + per_pin->pcm_idx =-1 ; + per_pin->pcm =NULL ; +if (idx >=0 && idx < spec->pcm_used) +clear_bit (idx, &spec->pcm_bitmap); +} +/* update per_pin ELD from the given new ELD; * setup info frame and notification accordingly */
@@ -1679,9 +1738,17 @@ static void update_eld(struct hda_codec *codec, struct hdmi_eld *eld) {struct hdmi_eld *pin_eld = &per_pin->sink_eld; +struct hdmi_spec *spec = codec->spec;bool old_eld_valid = pin_eld->eld_valid;bool eld_changed; +if (spec->dyn_pcm_assign) { +if (eld->eld_valid) +hdmi_attach_hda_pcm (spec, per_pin); +else +hdmi_detach_hda_pcm (spec, per_pin); + } +if (eld->eld_valid)snd_hdmi_show_eld (codec, &eld->info);
@@ -1825,13 +1892,19 @@ static void sync_eld_via_acomp(struct hda_codec *codec,static bool hdmi_present_sense (struct hdmi_spec_per_pin *per_pin,int repoll) {struct hda_codec *codec = per_pin->codec; +struct hdmi_spec *spec = codec->spec; +int ret; +mutex_lock (&spec->pcm_lock);if (codec_has_acomp (codec)) {sync_eld_via_acomp (codec, per_pin); -return false;/* don't call snd_hda_jack_report_sync() */ + ret = false;/* don't call snd_hda_jack_report_sync() */ }else { -return hdmi_present_sense_via_verbs (per_pin, repoll); + ret =hdmi_present_sense_via_verbs (per_pin, repoll); } +mutex_unlock (&spec->pcm_lock); + +return ret; }static void hdmi_repoll_eld (struct work_struct *work)
@@ -1875,6 +1948,11 @@ static int hdmi_add_pin(struct hda_codec *codec, hda_nid_t pin_nid) per_pin->pin_nid = pin_nid; per_pin->non_pcm = false; +if (spec->dyn_pcm_assign) + per_pin->pcm_idx =-1 ; +else + per_pin->pcm_idx = pin_idx; + per_pin->pin_nid_idx = pin_idx; err =hdmi_read_pin_conn (codec, pin_idx);if (err <0 )
Signature · 1 line
1.9.1
PATCH v5 2/2 ALSA: hda - hdmi setup pin when monitor hotplug in pcm dynamic assignment mode
From: Libin Yang <[email protected]>
Setup pin configuration when monitor is hotplugged in pcm dynamic assignment if the PCM is in open state.
When monitor is disconnect, The pin will be reset.
--- sound/pci/hda/patch_hdmi.c | 87 +++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 83 insertions(+), 4 deletions(-)
sound/pci/hda/patch_hdmi.c +83 -4
@@ -144,6 +144,11 @@ struct hdmi_spec {/* pcm_bitmap means which pcms have been assigned to pins*/ unsigned long pcm_bitmap;int pcm_used;/* counter of pcm_rec[] */ +/* bitmap shows whether the pcm is opened in user space +* bit 0 means the first playback PCM (PCM3); +* bit 1 means the second playback PCM, and so on. +*/ +unsigned long pcm_in_use;unsigned int channels_max;/* max over all cvts */ struct hdmi_eld temp_eld;
@@ -1523,10 +1528,14 @@ static int hdmi_pcm_open_no_pin(struct hda_pcm_stream *hinfo, {struct hdmi_spec *spec = codec->spec;struct snd_pcm_runtime *runtime = substream->runtime; -int cvt_idx; +int cvt_idx, pcm_idx;struct hdmi_spec_per_cvt *per_cvt =NULL ;int err; + pcm_idx =hinfo_to_pcm_index (codec, hinfo); +if (pcm_idx <0 ) +return -EINVAL ; + err =hdmi_choose_cvt (codec,-1 , &cvt_idx,NULL );if (err)return err;
@@ -1537,6 +1546,7 @@ static int hdmi_pcm_open_no_pin(struct hda_pcm_stream *hinfo,intel_not_share_assigned_cvt_nid (codec,0 , per_cvt->cvt_nid); +set_bit (pcm_idx, &spec->pcm_in_use);/* todo: setup spdif ctls assign */ /* Initially set the converter's capabilities */
@@ -1605,7 +1615,7 @@ static int hdmi_pcm_open(struct hda_pcm_stream *hinfo,/* Claim converter */ per_cvt->assigned =1 ; - +set_bit (pcm_idx, &spec->pcm_in_use); per_pin =get_pin (spec, pin_idx); per_pin->cvt_nid = per_cvt->cvt_nid; hinfo->nid = per_cvt->cvt_nid;
@@ -1730,6 +1740,71 @@ static void hdmi_detach_hda_pcm(struct hdmi_spec *spec,clear_bit (idx, &spec->pcm_bitmap); } +static int hdmi_get_pin_cvt_mux (struct hdmi_spec *spec, +struct hdmi_spec_per_pin *per_pin,hda_nid_t cvt_nid) +{ +int mux_idx; + +for (mux_idx =0 ; mux_idx < per_pin->num_mux_nids; mux_idx++) +if (per_pin->mux_nids[mux_idx] == cvt_nid) +break ; +return mux_idx; +} + +static bool check_non_pcm_per_cvt (struct hda_codec *codec,hda_nid_t cvt_nid); + +static void hdmi_pcm_setup_pin (struct hdmi_spec *spec, +struct hdmi_spec_per_pin *per_pin) +{ +struct hda_codec *codec = per_pin->codec; +struct hda_pcm *pcm; +struct hda_pcm_stream *hinfo; +struct snd_pcm_substream *substream; +int mux_idx; +bool non_pcm; + +if (per_pin->pcm_idx >=0 && per_pin->pcm_idx < spec->pcm_used) + pcm = spec->pcm_rec[per_pin->pcm_idx]; +else +return ; +if (!test_bit (per_pin->pcm_idx, &spec->pcm_in_use)) +return ; + +/* hdmi audio only uses playback and one substream */ + hinfo = pcm->stream; + substream = pcm->pcm->streams[0 ].substream; + + per_pin->cvt_nid = hinfo->nid; + + mux_idx =hdmi_get_pin_cvt_mux (spec, per_pin, hinfo->nid); +if (mux_idx < per_pin->num_mux_nids) +snd_hda_codec_write_cache (codec, per_pin->pin_nid,0 , +AC_VERB_SET_CONNECT_SEL , + mux_idx); +snd_hda_spdif_ctls_assign (codec, per_pin->pcm_idx, hinfo->nid); + + non_pcm =check_non_pcm_per_cvt (codec, hinfo->nid); +if (substream->runtime) + per_pin->channels = substream->runtime->channels; + per_pin->setup = true; + per_pin->mux_idx = mux_idx; + +hdmi_setup_audio_infoframe (codec, per_pin, non_pcm); +} + +static void hdmi_pcm_reset_pin (struct hdmi_spec *spec, +struct hdmi_spec_per_pin *per_pin) +{ +if (per_pin->pcm_idx >=0 && per_pin->pcm_idx < spec->pcm_used) +snd_hda_spdif_ctls_unassign (per_pin->codec, per_pin->pcm_idx); + + per_pin->chmap_set = false; +memset (per_pin->chmap,0 ,sizeof (per_pin->chmap)); + + per_pin->setup = false; + per_pin->channels =0 ; +} +/* update per_pin ELD from the given new ELD; * setup info frame and notification accordingly */
@@ -1743,10 +1818,13 @@ static void update_eld(struct hda_codec *codec,bool eld_changed;if (spec->dyn_pcm_assign) { -if (eld->eld_valid) +if (eld->eld_valid) {hdmi_attach_hda_pcm (spec, per_pin); -else +hdmi_pcm_setup_pin (spec, per_pin); + }else { +hdmi_pcm_reset_pin (spec, per_pin);hdmi_detach_hda_pcm (spec, per_pin); + } }if (eld->eld_valid)
@@ -2157,6 +2235,7 @@ static int hdmi_pcm_close(struct hda_pcm_stream *hinfo, hinfo->nid =0 ;mutex_lock (&spec->pcm_lock); +clear_bit (pcm_idx, &spec->pcm_in_use); pin_idx =hinfo_to_pin_index (codec, hinfo);if (spec->dyn_pcm_assign && pin_idx <0 ) {mutex_unlock (&spec->pcm_lock);
Signature · 1 line
1.9.1
Quoted 17 lines · On Wed, 16 Dec 2015 09:48:15 +0100, [email protected] wrote:
From: Libin Yang <[email protected]>
Dynamically bind/unbind the PCM to pin when HDMI/DP monitor hotplug.
When monitor is connected, find a proper PCM for the monitor. When monitor is disconnected, unbind the PCM from the pin.
The binding policy (use Intel platform as example) is:
1. Try to use the legacy pin-pcm mapping for the device entry 0 of the pin.
2. If step 1 fails, try to bind pin to the backup PCMs. For example, on Intel platform, if DP MST is enabled, 5 PCMs will be created. PCM 3, PCM 7, PCM 8 are supposed to be used by device entry 0 of pin 5, pin 6 and pin 7. PCM 9 and PCM 10 are the backup PCMs.
3. If step 2 fails, try to find any PCM to bind to the pin.
Quoted 1 line
Signed-off-by Libin Yang <[email protected]>
These two patches replaced in topic/hda-mst branch.
thanks,
Takashi
Quoted 150 lines
--- sound/pci/hda/patch_hdmi.c | 82 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 80 insertions(+), 2 deletions(-)sound/pci/hda/patch_hdmi.c +80
-2@@ -73,6 +73,8 @@ struct hdmi_spec_per_cvt {struct hdmi_spec_per_pin {hda_nid_t pin_nid; +/* pin idx, different device entries on the same pin use the same idx */ +int pin_nid_idx;int num_mux_nids;hda_nid_t mux_nids[HDA_MAX_CONNECTIONS ];int mux_idx;@@ -85,6 +87,7 @@ struct hdmi_spec_per_pin {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*/ +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 */ int channels;/* current number of channels */ @@ -138,6 +141,8 @@ struct hdmi_spec {struct snd_array pins;/* struct hdmi_spec_per_pin */ struct hda_pcm *pcm_rec[16 ];struct mutex pcm_lock; +/* pcm_bitmap means which pcms have been assigned to pins*/ +unsigned long pcm_bitmap;int pcm_used;/* counter of pcm_rec[] */ unsigned int channels_max;/* max over all cvts */ @@ -1671,6 +1676,60 @@ static int hdmi_read_pin_conn(struct hda_codec *codec, int pin_idx)return 0 ; } +static int hdmi_find_pcm_slot (struct hdmi_spec *spec, +struct hdmi_spec_per_pin *per_pin) +{ +int i; + +/* try the prefer PCM */ +if (!test_bit (per_pin->pin_nid_idx, &spec->pcm_bitmap)) +return per_pin->pin_nid_idx; + +/* have a second try; check the "reserved area" over num_pins */ +for (i = spec->num_pins; i < spec->pcm_used; i++) { +if (!test_bit (i, &spec->pcm_bitmap)) +return i; + } + +/* the last try; check the empty slots in pins */ +for (i =0 ; i < spec->num_pins; i++) { +if (!test_bit (i, &spec->pcm_bitmap)) +return i; + } +return -EBUSY ; +} + +static void hdmi_attach_hda_pcm (struct hdmi_spec *spec, +struct hdmi_spec_per_pin *per_pin) +{ +int idx; + +/* pcm already be attached to the pin */ +if (per_pin->pcm) +return ; + idx =hdmi_find_pcm_slot (spec, per_pin); +if (idx == -ENODEV ) +return ; + per_pin->pcm_idx = idx; + per_pin->pcm = spec->pcm_rec[idx]; +set_bit (idx, &spec->pcm_bitmap); +} + +static void hdmi_detach_hda_pcm (struct hdmi_spec *spec, +struct hdmi_spec_per_pin *per_pin) +{ +int idx; + +/* pcm already be detached from the pin */ +if (!per_pin->pcm) +return ; + idx = per_pin->pcm_idx; + per_pin->pcm_idx =-1 ; + per_pin->pcm =NULL ; +if (idx >=0 && idx < spec->pcm_used) +clear_bit (idx, &spec->pcm_bitmap); +} +/* update per_pin ELD from the given new ELD; * setup info frame and notification accordingly */ @@ -1679,9 +1738,17 @@ static void update_eld(struct hda_codec *codec, struct hdmi_eld *eld) {struct hdmi_eld *pin_eld = &per_pin->sink_eld; +struct hdmi_spec *spec = codec->spec;bool old_eld_valid = pin_eld->eld_valid;bool eld_changed; +if (spec->dyn_pcm_assign) { +if (eld->eld_valid) +hdmi_attach_hda_pcm (spec, per_pin); +else +hdmi_detach_hda_pcm (spec, per_pin); + } +if (eld->eld_valid)snd_hdmi_show_eld (codec, &eld->info);@@ -1825,13 +1892,19 @@ static void sync_eld_via_acomp(struct hda_codec *codec,static bool hdmi_present_sense (struct hdmi_spec_per_pin *per_pin,int repoll) {struct hda_codec *codec = per_pin->codec; +struct hdmi_spec *spec = codec->spec; +int ret; +mutex_lock (&spec->pcm_lock);if (codec_has_acomp (codec)) {sync_eld_via_acomp (codec, per_pin); -return false;/* don't call snd_hda_jack_report_sync() */ + ret = false;/* don't call snd_hda_jack_report_sync() */ }else { -return hdmi_present_sense_via_verbs (per_pin, repoll); + ret =hdmi_present_sense_via_verbs (per_pin, repoll); } +mutex_unlock (&spec->pcm_lock); + +return ret; }static void hdmi_repoll_eld (struct work_struct *work)@@ -1875,6 +1948,11 @@ static int hdmi_add_pin(struct hda_codec *codec, hda_nid_t pin_nid) per_pin->pin_nid = pin_nid; per_pin->non_pcm = false; +if (spec->dyn_pcm_assign) + per_pin->pcm_idx =-1 ; +else + per_pin->pcm_idx = pin_idx; + per_pin->pin_nid_idx = pin_idx; err =hdmi_read_pin_conn (codec, pin_idx);if (err <0 )Signature · 1 line
1.9.1