ASoC: hdac_hdmi: support 'ELD' mixer
PATCH 1/1 ASoC: hdac_hdmi: support 'ELD' mixer
Add an binary mixer 'ELD' to each HDMI PCM device so user space could read the ELD data of external HDMI display.
--- sound/soc/codecs/hdac_hdmi.c | 139 +++++++++++++++++++++++++++++++++++ 1 file changed, 139 insertions(+)
sound/soc/codecs/hdac_hdmi.c +139 -0
@@ -9,6 +9,7 @@* * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ +#include <linux/init.h> #include <linux/delay.h> #include <linux/module.h>
@@ -107,6 +108,7 @@ struct hdac_hdmi_pcm {unsigned char chmap[8 ];/* ALSA API channel-map */ struct mutex lock;int jack_event; +struct snd_kcontrol *eld_ctl; };struct hdac_hdmi_dai_port_map {
@@ -1248,6 +1250,7 @@ static void hdac_hdmi_present_sense(struct hdac_hdmi_pin *pin,struct hdac_hdmi_pcm *pcm;int size =0 ;int port_id =-1 ; +bool eld_valid, eld_changed;if (!hdmi)return ;
@@ -1273,6 +1276,8 @@ static void hdac_hdmi_present_sense(struct hdac_hdmi_pin *pin, size = -EINVAL ; } + eld_valid = port->eld.eld_valid; +if (size >0 ) { port->eld.eld_valid = true; port->eld.eld_size = size;
@@ -1281,6 +1286,8 @@ static void hdac_hdmi_present_sense(struct hdac_hdmi_pin *pin, port->eld.eld_size =0 ; } + eld_changed = (eld_valid != port->eld.eld_valid); + pcm =hdac_hdmi_get_pcm (hdev, port);if (!port->eld.monitor_present || !port->eld.eld_valid) {
@@ -1313,6 +1320,12 @@ static void hdac_hdmi_present_sense(struct hdac_hdmi_pin *pin, }mutex_unlock (&hdmi->pin_mutex); + +if (eld_changed && pcm) +snd_ctl_notify (hdmi->card, +SNDRV_CTL_EVENT_MASK_VALUE | +SNDRV_CTL_EVENT_MASK_INFO , + &pcm->eld_ctl->id); } static int hdac_hdmi_add_ports(struct hdac_device *hdev,
@@ -1411,6 +1424,122 @@ static void hdac_hdmi_skl_enable_dp12(struct hdac_device *hdev) } +static int hdac_hdmi_eld_ctl_info (struct snd_kcontrol *kcontrol, +struct snd_ctl_elem_info *uinfo) +{ +struct snd_soc_component *component =snd_kcontrol_chip (kcontrol); +struct hdac_hdmi_priv *hdmi =snd_soc_component_get_drvdata (component); +struct hdac_hdmi_pcm *pcm; +struct hdac_hdmi_port *port; +struct hdac_hdmi_eld *eld; + + uinfo->type =SNDRV_CTL_ELEM_TYPE_BYTES ; + uinfo->count =0 ; + + pcm =get_hdmi_pcm_from_id (hdmi, kcontrol->id.device); +if (!pcm) { +dev_dbg (component->dev,"%s: no pcm, device %d\n" , __func__, + kcontrol->id.device); +return 0 ; + } + +if (list_empty (&pcm->port_list)) { +dev_dbg (component->dev,"%s: empty port list, device %d\n" , + __func__, kcontrol->id.device); +return 0 ; + } + +mutex_lock (&hdmi->pin_mutex); + +list_for_each_entry (port, &pcm->port_list, head) { + eld = &port->eld; + +if (eld->eld_valid) { + uinfo->count = eld->eld_size; +break ; + } + } + +mutex_unlock (&hdmi->pin_mutex); + +return 0 ; +} + +static int hdac_hdmi_eld_ctl_get (struct snd_kcontrol *kcontrol, +struct snd_ctl_elem_value *ucontrol) +{ +struct snd_soc_component *component =snd_kcontrol_chip (kcontrol); +struct hdac_hdmi_priv *hdmi =snd_soc_component_get_drvdata (component); +struct hdac_hdmi_pcm *pcm; +struct hdac_hdmi_port *port; +struct hdac_hdmi_eld *eld; + +memset (ucontrol->value.bytes.data,0 ,ARRAY_SIZE (ucontrol->value.bytes.data)); + + pcm =get_hdmi_pcm_from_id (hdmi, kcontrol->id.device); +if (!pcm) { +dev_dbg (component->dev,"%s: no pcm, device %d\n" , __func__, + kcontrol->id.device); +return 0 ; + } + +if (list_empty (&pcm->port_list)) { +dev_dbg (component->dev,"%s: empty port list, device %d\n" , + __func__, kcontrol->id.device); +return 0 ; + } + +mutex_lock (&hdmi->pin_mutex); + +list_for_each_entry (port, &pcm->port_list, head) { + eld = &port->eld; + +if (!eld->eld_valid) +continue ; + +if (eld->eld_size >ARRAY_SIZE (ucontrol->value.bytes.data) || + eld->eld_size >ELD_MAX_SIZE ) { +mutex_unlock (&hdmi->pin_mutex); + +dev_err (component->dev,"%s: buffer too small, device %d eld_size %d\n" , + __func__, kcontrol->id.device, eld->eld_size); +snd_BUG (); +return -EINVAL ; + } + +memcpy (ucontrol->value.bytes.data, eld->eld_buffer, + eld->eld_size); +break ; + } + +mutex_unlock (&hdmi->pin_mutex); + +return 0 ; +} + +static int hdac_hdmi_create_eld_ctl (struct snd_soc_component *component,struct hdac_hdmi_pcm *pcm) +{ +struct snd_kcontrol *kctl; +struct snd_kcontrol_new hdmi_eld_ctl = { + .access =SNDRV_CTL_ELEM_ACCESS_READ | +SNDRV_CTL_ELEM_ACCESS_VOLATILE , + .iface =SNDRV_CTL_ELEM_IFACE_PCM , + .name ="ELD" , + .info = hdac_hdmi_eld_ctl_info, + .get = hdac_hdmi_eld_ctl_get, + .device = pcm->pcm_id, + }; + +/* add ELD ctl with the device number corresponding to the PCM stream */ + kctl =snd_ctl_new1 (&hdmi_eld_ctl, component); +if (!kctl) +return -ENOMEM ; + + pcm->eld_ctl = kctl; + +return snd_ctl_add (component->card->snd_card, kctl); +} +static const struct snd_soc_dai_ops hdmi_dai_ops = { .startup = hdac_hdmi_pcm_open, .shutdown = hdac_hdmi_pcm_close,
@@ -1784,6 +1913,16 @@ int hdac_hdmi_jack_init(struct snd_soc_dai *dai, int device, } } +/* add control for ELD Bytes */ + err =hdac_hdmi_create_eld_ctl (component, pcm); +if (err <0 ) { +dev_err (&hdev->dev, +"eld control add failed with err: %d for pcm: %d\n" , + err, device); +kfree (pcm); +return err; + } +list_add_tail (&pcm->head, &hdmi->pcm_list);return 0 ;
Signature · 1 line
2.17.1
sound/soc/codecs/hdac_hdmi.c int hdac_hdmi_jack_init(struct snd_soc_dai *dai, int device, · line 1922
Quoted 11 lines · Brent Lu
sound/soc/codecs/hdac_hdmi.c +7
-0@@ -1784,6 +1913,16 @@ int hdac_hdmi_jack_init(struct snd_soc_dai *dai, int device, } } +/* add control for ELD Bytes */ + err =hdac_hdmi_create_eld_ctl (component, pcm); +if (err <0 ) { +dev_err (&hdev->dev, +"eld control add failed with err: %d for pcm: %d\n" , + err, device); +kfree (pcm);
pcm is allocated vida devm_kzalloc(), hence you shoudn't free it explicitly.
thanks,
Takashi
Quoted 9 lines
sound/soc/codecs/hdac_hdmi.c int hdac_hdmi_jack_init(struct snd_soc_dai *dai, int device, · line 1922
Quoted 7 lines
sound/soc/codecs/hdac_hdmi.c +7
-0+/* add control for ELD Bytes */ + err =hdac_hdmi_create_eld_ctl (component, pcm); +if (err <0 ) { +dev_err (&hdev->dev, +"eld control add failed with err: %d for pcm: %d\n" , + err, device); +kfree (pcm);pcm is allocated vida
devm_kzalloc(), hence you shoudn't free it explicitly.
Will fix it in v2. Thanks.
Brent
Quoted 5 lines
thanks,
Takashi
PATCH v2 1/1 ASoC: hdac_hdmi: support 'ELD' mixer
In reply to Brent LuAdd an binary mixer 'ELD' to each HDMI PCM device so user space could read the ELD data of external HDMI display.
--- sound/soc/codecs/hdac_hdmi.c | 138 +++++++++++++++++++++++++++++++++++ 1 file changed, 138 insertions(+)
sound/soc/codecs/hdac_hdmi.c +138 -0
@@ -9,6 +9,7 @@* * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ +#include <linux/init.h> #include <linux/delay.h> #include <linux/module.h>
@@ -107,6 +108,7 @@ struct hdac_hdmi_pcm {unsigned char chmap[8 ];/* ALSA API channel-map */ struct mutex lock;int jack_event; +struct snd_kcontrol *eld_ctl; };struct hdac_hdmi_dai_port_map {
@@ -1248,6 +1250,7 @@ static void hdac_hdmi_present_sense(struct hdac_hdmi_pin *pin,struct hdac_hdmi_pcm *pcm;int size =0 ;int port_id =-1 ; +bool eld_valid, eld_changed;if (!hdmi)return ;
@@ -1273,6 +1276,8 @@ static void hdac_hdmi_present_sense(struct hdac_hdmi_pin *pin, size = -EINVAL ; } + eld_valid = port->eld.eld_valid; +if (size >0 ) { port->eld.eld_valid = true; port->eld.eld_size = size;
@@ -1281,6 +1286,8 @@ static void hdac_hdmi_present_sense(struct hdac_hdmi_pin *pin, port->eld.eld_size =0 ; } + eld_changed = (eld_valid != port->eld.eld_valid); + pcm =hdac_hdmi_get_pcm (hdev, port);if (!port->eld.monitor_present || !port->eld.eld_valid) {
@@ -1313,6 +1320,12 @@ static void hdac_hdmi_present_sense(struct hdac_hdmi_pin *pin, }mutex_unlock (&hdmi->pin_mutex); + +if (eld_changed && pcm) +snd_ctl_notify (hdmi->card, +SNDRV_CTL_EVENT_MASK_VALUE | +SNDRV_CTL_EVENT_MASK_INFO , + &pcm->eld_ctl->id); } static int hdac_hdmi_add_ports(struct hdac_device *hdev,
@@ -1411,6 +1424,122 @@ static void hdac_hdmi_skl_enable_dp12(struct hdac_device *hdev) } +static int hdac_hdmi_eld_ctl_info (struct snd_kcontrol *kcontrol, +struct snd_ctl_elem_info *uinfo) +{ +struct snd_soc_component *component =snd_kcontrol_chip (kcontrol); +struct hdac_hdmi_priv *hdmi =snd_soc_component_get_drvdata (component); +struct hdac_hdmi_pcm *pcm; +struct hdac_hdmi_port *port; +struct hdac_hdmi_eld *eld; + + uinfo->type =SNDRV_CTL_ELEM_TYPE_BYTES ; + uinfo->count =0 ; + + pcm =get_hdmi_pcm_from_id (hdmi, kcontrol->id.device); +if (!pcm) { +dev_dbg (component->dev,"%s: no pcm, device %d\n" , __func__, + kcontrol->id.device); +return 0 ; + } + +if (list_empty (&pcm->port_list)) { +dev_dbg (component->dev,"%s: empty port list, device %d\n" , + __func__, kcontrol->id.device); +return 0 ; + } + +mutex_lock (&hdmi->pin_mutex); + +list_for_each_entry (port, &pcm->port_list, head) { + eld = &port->eld; + +if (eld->eld_valid) { + uinfo->count = eld->eld_size; +break ; + } + } + +mutex_unlock (&hdmi->pin_mutex); + +return 0 ; +} + +static int hdac_hdmi_eld_ctl_get (struct snd_kcontrol *kcontrol, +struct snd_ctl_elem_value *ucontrol) +{ +struct snd_soc_component *component =snd_kcontrol_chip (kcontrol); +struct hdac_hdmi_priv *hdmi =snd_soc_component_get_drvdata (component); +struct hdac_hdmi_pcm *pcm; +struct hdac_hdmi_port *port; +struct hdac_hdmi_eld *eld; + +memset (ucontrol->value.bytes.data,0 ,ARRAY_SIZE (ucontrol->value.bytes.data)); + + pcm =get_hdmi_pcm_from_id (hdmi, kcontrol->id.device); +if (!pcm) { +dev_dbg (component->dev,"%s: no pcm, device %d\n" , __func__, + kcontrol->id.device); +return 0 ; + } + +if (list_empty (&pcm->port_list)) { +dev_dbg (component->dev,"%s: empty port list, device %d\n" , + __func__, kcontrol->id.device); +return 0 ; + } + +mutex_lock (&hdmi->pin_mutex); + +list_for_each_entry (port, &pcm->port_list, head) { + eld = &port->eld; + +if (!eld->eld_valid) +continue ; + +if (eld->eld_size >ARRAY_SIZE (ucontrol->value.bytes.data) || + eld->eld_size >ELD_MAX_SIZE ) { +mutex_unlock (&hdmi->pin_mutex); + +dev_err (component->dev,"%s: buffer too small, device %d eld_size %d\n" , + __func__, kcontrol->id.device, eld->eld_size); +snd_BUG (); +return -EINVAL ; + } + +memcpy (ucontrol->value.bytes.data, eld->eld_buffer, + eld->eld_size); +break ; + } + +mutex_unlock (&hdmi->pin_mutex); + +return 0 ; +} + +static int hdac_hdmi_create_eld_ctl (struct snd_soc_component *component,struct hdac_hdmi_pcm *pcm) +{ +struct snd_kcontrol *kctl; +struct snd_kcontrol_new hdmi_eld_ctl = { + .access =SNDRV_CTL_ELEM_ACCESS_READ | +SNDRV_CTL_ELEM_ACCESS_VOLATILE , + .iface =SNDRV_CTL_ELEM_IFACE_PCM , + .name ="ELD" , + .info = hdac_hdmi_eld_ctl_info, + .get = hdac_hdmi_eld_ctl_get, + .device = pcm->pcm_id, + }; + +/* add ELD ctl with the device number corresponding to the PCM stream */ + kctl =snd_ctl_new1 (&hdmi_eld_ctl, component); +if (!kctl) +return -ENOMEM ; + + pcm->eld_ctl = kctl; + +return snd_ctl_add (component->card->snd_card, kctl); +} +static const struct snd_soc_dai_ops hdmi_dai_ops = { .startup = hdac_hdmi_pcm_open, .shutdown = hdac_hdmi_pcm_close,
@@ -1784,6 +1913,15 @@ int hdac_hdmi_jack_init(struct snd_soc_dai *dai, int device, } } +/* add control for ELD Bytes */ + err =hdac_hdmi_create_eld_ctl (component, pcm); +if (err <0 ) { +dev_err (&hdev->dev, +"eld control add failed with err: %d for pcm: %d\n" , + err, device); +return err; + } +list_add_tail (&pcm->head, &hdmi->pcm_list);return 0 ;
Signature · 1 line
2.17.1
Hey,
a general comment first. We are trying to move development to patch_hdmi, but given we still have platforms using hdac_hdmi, this patch seems like a useful addition.
Quoted 2 lines · Brent Lu
Add an binary mixer 'ELD' to each HDMI PCM device so user space could read the ELD data of external HDMI display.
Minor spelling fixes:
"Add a binary mixer"
"so user space can read"
Quoted 3 lines
sound/soc/codecs/hdac_hdmi.c +3
-0+static int hdac_hdmi_eld_ctl_get (struct snd_kcontrol *kcontrol, +struct snd_ctl_elem_value *ucontrol) +{
[...]
Quoted 3 lines
sound/soc/codecs/hdac_hdmi.c +3
-0+list_for_each_entry (port, &pcm->port_list, head) { + eld = &port->eld; +
[...]
sound/soc/codecs/hdac_hdmi.c static void hdac_hdmi_skl_enable_dp12(struct hdac_device *hdev) · line 1513
Quoted 4 lines
sound/soc/codecs/hdac_hdmi.c +4
-0+memcpy (ucontrol->value.bytes.data, eld->eld_buffer, + eld->eld_size); +break ; + }
This is a bit iffy part. If same PCM is connected to multiple receivers, you return ELD data for the first one and ignore the rest. OTOH, this is inline with comment in hdac_hdmi_get_port_from_cvt() in that this pcm-to-many routing is not really supported by the driver now. But jack status reporting is done a port basis, not per PCM/CVTs, so this is not fully aligned.
Hmm. Given the proposed patch is aligned with the user-space interface exposed by patch_hdmi.c, I'm ok to go with this. Can you add an explicit comment to explain what is happening above?
Br, Kai
Quoted 7 lines
This is a bit iffy part. If same PCM is connected to multiple receivers, you return ELD data for the first one and ignore the rest. OTOH, this is inline with comment in
hdac_hdmi_get_port_from_cvt()in that this pcm-to-many routing is not really supported by the driver now. But jack status reporting is done a port basis, not per PCM/CVTs, so this is not fully aligned.
Quoted 5 lines
Hmm. Given the proposed patch is aligned with the user-space interface exposed by
patch_hdmi.c, I'm ok to go with this. Can you add an explicit comment to explain what is happening above?Br, Kai
Fix it in v3. Thank you for the review.
Regards,
Brent
PATCH v3 1/1 ASoC: hdac_hdmi: support 'ELD' mixer
In reply to Brent LuAdd a binary mixer 'ELD' to each HDMI PCM device so user-space can read the ELD data of external HDMI display.
If same PCM is connected to multiple receivers, the mixer returns the ELD data for the first one found in the port list and ignore the rest. Thie behavior seems iffy but is aligned with the user-space interface exposed by patch_hdmi.c. Also the pcm-to-many routing is nor really supported by the driver now.
--- sound/soc/codecs/hdac_hdmi.c | 138 +++++++++++++++++++++++++++++++++++ 1 file changed, 138 insertions(+)
sound/soc/codecs/hdac_hdmi.c +138 -0
@@ -9,6 +9,7 @@* * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ +#include <linux/init.h> #include <linux/delay.h> #include <linux/module.h>
@@ -107,6 +108,7 @@ struct hdac_hdmi_pcm {unsigned char chmap[8 ];/* ALSA API channel-map */ struct mutex lock;int jack_event; +struct snd_kcontrol *eld_ctl; };struct hdac_hdmi_dai_port_map {
@@ -1248,6 +1250,7 @@ static void hdac_hdmi_present_sense(struct hdac_hdmi_pin *pin,struct hdac_hdmi_pcm *pcm;int size =0 ;int port_id =-1 ; +bool eld_valid, eld_changed;if (!hdmi)return ;
@@ -1273,6 +1276,8 @@ static void hdac_hdmi_present_sense(struct hdac_hdmi_pin *pin, size = -EINVAL ; } + eld_valid = port->eld.eld_valid; +if (size >0 ) { port->eld.eld_valid = true; port->eld.eld_size = size;
@@ -1281,6 +1286,8 @@ static void hdac_hdmi_present_sense(struct hdac_hdmi_pin *pin, port->eld.eld_size =0 ; } + eld_changed = (eld_valid != port->eld.eld_valid); + pcm =hdac_hdmi_get_pcm (hdev, port);if (!port->eld.monitor_present || !port->eld.eld_valid) {
@@ -1313,6 +1320,12 @@ static void hdac_hdmi_present_sense(struct hdac_hdmi_pin *pin, }mutex_unlock (&hdmi->pin_mutex); + +if (eld_changed && pcm) +snd_ctl_notify (hdmi->card, +SNDRV_CTL_EVENT_MASK_VALUE | +SNDRV_CTL_EVENT_MASK_INFO , + &pcm->eld_ctl->id); } static int hdac_hdmi_add_ports(struct hdac_device *hdev,
@@ -1411,6 +1424,122 @@ static void hdac_hdmi_skl_enable_dp12(struct hdac_device *hdev) } +static int hdac_hdmi_eld_ctl_info (struct snd_kcontrol *kcontrol, +struct snd_ctl_elem_info *uinfo) +{ +struct snd_soc_component *component =snd_kcontrol_chip (kcontrol); +struct hdac_hdmi_priv *hdmi =snd_soc_component_get_drvdata (component); +struct hdac_hdmi_pcm *pcm; +struct hdac_hdmi_port *port; +struct hdac_hdmi_eld *eld; + + uinfo->type =SNDRV_CTL_ELEM_TYPE_BYTES ; + uinfo->count =0 ; + + pcm =get_hdmi_pcm_from_id (hdmi, kcontrol->id.device); +if (!pcm) { +dev_dbg (component->dev,"%s: no pcm, device %d\n" , __func__, + kcontrol->id.device); +return 0 ; + } + +if (list_empty (&pcm->port_list)) { +dev_dbg (component->dev,"%s: empty port list, device %d\n" , + __func__, kcontrol->id.device); +return 0 ; + } + +mutex_lock (&hdmi->pin_mutex); + +list_for_each_entry (port, &pcm->port_list, head) { + eld = &port->eld; + +if (eld->eld_valid) { + uinfo->count = eld->eld_size; +break ; + } + } + +mutex_unlock (&hdmi->pin_mutex); + +return 0 ; +} + +static int hdac_hdmi_eld_ctl_get (struct snd_kcontrol *kcontrol, +struct snd_ctl_elem_value *ucontrol) +{ +struct snd_soc_component *component =snd_kcontrol_chip (kcontrol); +struct hdac_hdmi_priv *hdmi =snd_soc_component_get_drvdata (component); +struct hdac_hdmi_pcm *pcm; +struct hdac_hdmi_port *port; +struct hdac_hdmi_eld *eld; + +memset (ucontrol->value.bytes.data,0 ,ARRAY_SIZE (ucontrol->value.bytes.data)); + + pcm =get_hdmi_pcm_from_id (hdmi, kcontrol->id.device); +if (!pcm) { +dev_dbg (component->dev,"%s: no pcm, device %d\n" , __func__, + kcontrol->id.device); +return 0 ; + } + +if (list_empty (&pcm->port_list)) { +dev_dbg (component->dev,"%s: empty port list, device %d\n" , + __func__, kcontrol->id.device); +return 0 ; + } + +mutex_lock (&hdmi->pin_mutex); + +list_for_each_entry (port, &pcm->port_list, head) { + eld = &port->eld; + +if (!eld->eld_valid) +continue ; + +if (eld->eld_size >ARRAY_SIZE (ucontrol->value.bytes.data) || + eld->eld_size >ELD_MAX_SIZE ) { +mutex_unlock (&hdmi->pin_mutex); + +dev_err (component->dev,"%s: buffer too small, device %d eld_size %d\n" , + __func__, kcontrol->id.device, eld->eld_size); +snd_BUG (); +return -EINVAL ; + } + +memcpy (ucontrol->value.bytes.data, eld->eld_buffer, + eld->eld_size); +break ; + } + +mutex_unlock (&hdmi->pin_mutex); + +return 0 ; +} + +static int hdac_hdmi_create_eld_ctl (struct snd_soc_component *component,struct hdac_hdmi_pcm *pcm) +{ +struct snd_kcontrol *kctl; +struct snd_kcontrol_new hdmi_eld_ctl = { + .access =SNDRV_CTL_ELEM_ACCESS_READ | +SNDRV_CTL_ELEM_ACCESS_VOLATILE , + .iface =SNDRV_CTL_ELEM_IFACE_PCM , + .name ="ELD" , + .info = hdac_hdmi_eld_ctl_info, + .get = hdac_hdmi_eld_ctl_get, + .device = pcm->pcm_id, + }; + +/* add ELD ctl with the device number corresponding to the PCM stream */ + kctl =snd_ctl_new1 (&hdmi_eld_ctl, component); +if (!kctl) +return -ENOMEM ; + + pcm->eld_ctl = kctl; + +return snd_ctl_add (component->card->snd_card, kctl); +} +static const struct snd_soc_dai_ops hdmi_dai_ops = { .startup = hdac_hdmi_pcm_open, .shutdown = hdac_hdmi_pcm_close,
@@ -1784,6 +1913,15 @@ int hdac_hdmi_jack_init(struct snd_soc_dai *dai, int device, } } +/* add control for ELD Bytes */ + err =hdac_hdmi_create_eld_ctl (component, pcm); +if (err <0 ) { +dev_err (&hdev->dev, +"eld control add failed with err: %d for pcm: %d\n" , + err, device); +return err; + } +list_add_tail (&pcm->head, &hdmi->pcm_list);return 0 ;
Signature · 1 line
2.17.1
Mark Brown
maintainerQuoted 2 lines · Brent Lu
Add a binary mixer 'ELD' to each HDMI PCM device so user-space can read the ELD data of external HDMI display.
Please don't send new patches in the middle of existing threads, it makes it hard to keep track fo what is going on.
Quoted 3 lines
Please don't send new patches in the middle of existing threads, it makes it hard to keep track fo what is going on.
Sorry for the problem. Does it mean I should avoid using " --in-reply-to=" when sending new patch set?
Regards,
Brent
Mark Brown
maintainerQuoted 5 lines · Brent
Quoted 2 lines
Please don't send new patches in the middle of existing threads, it makes it hard to keep track fo what is going on.
Sorry for the problem. Does it mean I should avoid using " --in-reply-to=" when sending new patch set?
Yes, please.
Mark Brown
maintainerQuoted 8 lines · Brent Lu
Add a binary mixer 'ELD' to each HDMI PCM device so user-space can read the ELD data of external HDMI display.
If same PCM is connected to multiple receivers, the mixer returns the ELD data for the first one found in the port list and ignore the rest. Thie behavior seems iffy but is aligned with the user-space interface exposed by
patch_hdmi.c. Also the pcm-to-many routing is nor really supported by the driver now.
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/1] ASoC: hdac_hdmi: support 'ELD' mixer
commit: 1f53bcb3fc952b55a0ad0e7f6eabfc93a170659d
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Mark Brown
maintainerQuoted 8 lines · Brent Lu
Add a binary mixer 'ELD' to each HDMI PCM device so user-space can read the ELD data of external HDMI display.
If same PCM is connected to multiple receivers, the mixer returns the ELD data for the first one found in the port list and ignore the rest. Thie behavior seems iffy but is aligned with the user-space interface exposed by
patch_hdmi.c. Also the pcm-to-many routing is nor really supported by the driver now.
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/1] ASoC: hdac_hdmi: support 'ELD' mixer
commit: 1f53bcb3fc952b55a0ad0e7f6eabfc93a170659d
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Mark Brown
maintainerQuoted 2 lines · Brent Lu
Add an binary mixer 'ELD' to each HDMI PCM device so user space could read the ELD data of external HDMI display.
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/1] ASoC: hdac_hdmi: support 'ELD' mixer
commit: 1f53bcb3fc952b55a0ad0e7f6eabfc93a170659d
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark