ASoc: hdac_hdmi: Configure pin verbs for MST

To enable stream on a specific port of a MST capable pin, the port
needs to be selected before we configure the pin widget verb.

When port is selected, all the pin widget verb controlling the sink
device operation will be directed to selected port. So add port
selection before configuring the pin widget verb.

Signed-off-by: Jeeja KP <jeeja.kp@intel.com>
Acked-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/hdac_hdmi.c b/sound/soc/codecs/hdac_hdmi.c
index c5527e81a4902d24b486e02e09697c0aa50d50a4..6cf86a0a118c001e268f531928e69a739d8de27e 100644 (file)
--- a/sound/soc/codecs/hdac_hdmi.c
+++ b/sound/soc/codecs/hdac_hdmi.c
@@ -448,6 +448,9 @@ static int hdac_hdmi_query_port_connlist(struct hdac_ext_device *hdac,
                return -EINVAL;
        }
 
+       if (hdac_hdmi_port_select_set(hdac, port) < 0)
+               return -EIO;
+
        port->num_mux_nids = snd_hdac_get_connections(&hdac->hdac, pin->nid,
                        port->mux_nids, HDA_MAX_CONNECTIONS);
        if (port->num_mux_nids == 0)
@@ -687,6 +690,10 @@ static int hdac_hdmi_pin_output_widget_event(struct snd_soc_dapm_widget *w,
        if (!pcm)
                return -EIO;
 
+       /* set the device if pin is mst_capable */
+       if (hdac_hdmi_port_select_set(edev, port) < 0)
+               return -EIO;
+
        switch (event) {
        case SND_SOC_DAPM_PRE_PMU:
                hdac_hdmi_set_power_state(edev, port->pin->nid, AC_PWRST_D0);
@@ -775,6 +782,11 @@ static int hdac_hdmi_pin_mux_widget_event(struct snd_soc_dapm_widget *w,
                kc  = w->kcontrols[0];
 
        mux_idx = dapm_kcontrol_get_value(kc);
+
+       /* set the device if pin is mst_capable */
+       if (hdac_hdmi_port_select_set(edev, port) < 0)
+               return -EIO;
+
        if (mux_idx > 0) {
                snd_hdac_codec_write(&edev->hdac, port->pin->nid, 0,
                        AC_VERB_SET_CONNECT_SEL, (mux_idx - 1));