* [PATCH] ASoC: hdac_hdmi: Program pin-port-mux during jack report event
@ 2018-02-01 3:06 Guneshwor Singh
2018-03-19 12:02 ` Vinod Koul
0 siblings, 1 reply; 2+ messages in thread
From: Guneshwor Singh @ 2018-02-01 3:06 UTC (permalink / raw)
To: ALSA, Mark Brown
Cc: Takashi Iwai, Sriram Periyasamy, Guneshwor Singh, Patches Audio,
Liam Girdwood, Vinod Koul, Jeeja KP, Sanyog Kale
From: Sriram Periyasamy <sriramx.periyasamy@intel.com>
During d3/d0 cycle, the connection selection index of all pins points
to the default value. This needs to be restored to ensure audio is
restored after d3/d0 cycle.
So store the connection selection index and program it during jack
report event which gets invoked in cases like d3/d0 cycle, hot plug
detection when multiple displays are connected.
Signed-off-by: Sriram Periyasamy <sriramx.periyasamy@intel.com>
Signed-off-by: Sanyog Kale <sanyog.r.kale@intel.com>
Signed-off-by: Jeeja KP <jeeja.kp@intel.com>
Signed-off-by: Guneshwor Singh <guneshwor.o.singh@intel.com>
---
sound/soc/codecs/hdac_hdmi.c | 32 ++++++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
diff --git a/sound/soc/codecs/hdac_hdmi.c b/sound/soc/codecs/hdac_hdmi.c
index dba6f4c5074a..cabcb75bf4fc 100644
--- a/sound/soc/codecs/hdac_hdmi.c
+++ b/sound/soc/codecs/hdac_hdmi.c
@@ -32,6 +32,7 @@
#include <sound/hda_chmap.h>
#include "../../hda/local.h"
#include "hdac_hdmi.h"
+#include <sound/hda_regmap.h>
#define NAME_SIZE 32
@@ -83,6 +84,7 @@ struct hdac_hdmi_pin {
struct list_head head;
hda_nid_t nid;
bool mst_capable;
+ int conn_index;
struct hdac_hdmi_port *ports;
int num_ports;
struct hdac_ext_device *edev;
@@ -141,6 +143,9 @@ struct hdac_hdmi_priv {
#define hdev_to_hdmi_priv(_hdev) ((to_ehdac_device(_hdev))->private_data)
+static int hdac_hdmi_port_select_set(struct hdac_ext_device *edev,
+ struct hdac_hdmi_port *port);
+
static struct hdac_hdmi_pcm *
hdac_hdmi_get_pcm_from_cvt(struct hdac_hdmi_priv *hdmi,
struct hdac_hdmi_cvt *cvt)
@@ -159,6 +164,7 @@ static void hdac_hdmi_jack_report(struct hdac_hdmi_pcm *pcm,
struct hdac_hdmi_port *port, bool is_connect)
{
struct hdac_ext_device *edev = port->pin->edev;
+ int cmd, err;
if (is_connect)
snd_soc_dapm_enable_pin(port->dapm, port->jack_pin);
@@ -166,6 +172,29 @@ static void hdac_hdmi_jack_report(struct hdac_hdmi_pcm *pcm,
snd_soc_dapm_disable_pin(port->dapm, port->jack_pin);
if (is_connect) {
+ /* set the device if pin is mst_capable */
+ if (hdac_hdmi_port_select_set(edev, port) < 0) {
+ dev_err(&edev->hdev.dev,
+ "port %d device select fail\n", port->id);
+ return;
+ }
+ /*
+ * Restore the connection selection index of the
+ * respective pin.
+ */
+ if (port->pin->conn_index > 0) {
+ cmd = snd_hdac_regmap_encode_verb(port->pin->nid,
+ AC_VERB_SET_CONNECT_SEL);
+ err = snd_hdac_regmap_write_raw(&edev->hdev, cmd,
+ port->pin->conn_index - 1);
+ if (err < 0) {
+ dev_err(&edev->hdev.dev,
+ "pin %d conn select index fail %d\n",
+ port->pin->nid, err);
+ return;
+ }
+ }
+
/*
* Report Jack connect event when a device is connected
* for the first time where same PCM is attached to multiple
@@ -891,6 +920,9 @@ static int hdac_hdmi_set_pin_port_mux(struct snd_kcontrol *kcontrol,
}
}
+ if (ucontrol->value.enumerated.item[0] > 0)
+ port->pin->conn_index = ucontrol->value.enumerated.item[0];
+
/*
* Jack status is not reported during device probe as the
* PCMs are not registered by then. So report it here.
--
2.16.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] ASoC: hdac_hdmi: Program pin-port-mux during jack report event
2018-02-01 3:06 [PATCH] ASoC: hdac_hdmi: Program pin-port-mux during jack report event Guneshwor Singh
@ 2018-03-19 12:02 ` Vinod Koul
0 siblings, 0 replies; 2+ messages in thread
From: Vinod Koul @ 2018-03-19 12:02 UTC (permalink / raw)
To: Guneshwor Singh
Cc: ALSA, Takashi Iwai, Sriram Periyasamy, Liam Girdwood,
Patches Audio, Mark Brown, Jeeja KP, Sanyog Kale
On Thu, Feb 01, 2018 at 08:36:50AM +0530, Guneshwor Singh wrote:
> From: Sriram Periyasamy <sriramx.periyasamy@intel.com>
>
> During d3/d0 cycle, the connection selection index of all pins points
> to the default value. This needs to be restored to ensure audio is
> restored after d3/d0 cycle.
>
> So store the connection selection index and program it during jack
> report event which gets invoked in cases like d3/d0 cycle, hot plug
> detection when multiple displays are connected.
Acked-By: Vinod Koul <vinod.koul@intel.com>
--
~Vinod
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-03-19 11:58 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-02-01 3:06 [PATCH] ASoC: hdac_hdmi: Program pin-port-mux during jack report event Guneshwor Singh
2018-03-19 12:02 ` Vinod Koul
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.